michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Always update the usermin version, since we don't need to check that their os_list files are in sync

Browse Source
This commit is contained in:
Jamie Cameron
2025-01-25 17:52:54 -08:00
parent 401631daec
commit ad0b28abf7
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
webmin/webmin-lib.pl
View File

@@ -2651,21 +2651,15 @@ if (&foreign_installed("usermin")) {
&foreign_require("usermin");
my %miniserv;
&usermin::get_usermin_miniserv_config(\%miniserv);
my @ust = stat("$miniserv{'root'}/os_list.txt");
my @wst = stat("$root_directory/os_list.txt");
if ($ust[7] == $wst[7]) {
# os_list.txt is the same, so we can assume the same OS codes
# are supported
my %uconfig;
&lock_file($usermin::usermin_config);
&usermin::get_usermin_config(\%uconfig);
$uconfig{'real_os_type'} = $osinfo{'real_os_type'};
$uconfig{'real_os_version'} = $osinfo{'real_os_version'};
$uconfig{'os_type'} = $osinfo{'os_type'};
$uconfig{'os_version'} = $osinfo{'os_version'};
&usermin::put_usermin_config(\%uconfig);
&unlock_file($usermin::usermin_config);
}
my %uconfig;
&lock_file($usermin::usermin_config);
&usermin::get_usermin_config(\%uconfig);
$uconfig{'real_os_type'} = $osinfo{'real_os_type'};
$uconfig{'real_os_version'} = $osinfo{'real_os_version'};
$uconfig{'os_type'} = $osinfo{'os_type'};
$uconfig{'os_version'} = $osinfo{'os_version'};
&usermin::put_usermin_config(\%uconfig);
&unlock_file($usermin::usermin_config);
}
}