VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix needs-restarting not call twice

Browse Source
This commit is contained in:
iliajie
2023-03-04 13:30:04 +02:00
parent 30208960a1
commit fe8bcba3a4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
package-updates/package-updates-lib.pl
View File

@ -687,13 +687,14 @@ return 0 if ($no_collect);
if ($gconfig{'os_type'} eq 'debian-linux') {
return -e "/var/run/reboot-required" ? 1 : 0;
}
elsif ($gconfig{'os_type'} eq 'redhat-linux' &&
&has_command("needs-restarting")) {
my $out = &backquote_command("needs-restarting -h 2>&1");
if ($out =~ /reboothint/) {
my $ex = &execute_command(
"needs-restarting -r", undef, undef, undef, 0, 1);
return $ex ? 1 : 0;
elsif ($gconfig{'os_type'} eq 'redhat-linux') {
my $needs_restarting_cmd = "needs-restarting";
my $needs_restarting = has_command($needs_restarting_cmd);
if ($needs_restarting) {
my $needs_restarting_rs =
&backquote_command("$needs_restarting -r 2>&1 </dev/null");
return 1
if ("$?" != 0 && index($needs_restarting_rs, $needs_restarting_cmd) == -1);
}
}
return 0;