public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch-to-configuration: Don't restart the suspend/hibernate targets

Browse Source 
Restarting them has the side effect of suspending/hibernating the
system again.
This commit is contained in:
Eelco Dolstra 2012-08-23 11:09:44 -04:00
parent 9e5bbee2b1
commit af550048e8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/system/activation/switch-to-configuration.pl
View File

@ -111,10 +111,14 @@ while (my ($unit, $state) = each %{$activePrev}) {
# Cause all active target units to be restarted below. # Cause all active target units to be restarted below.
# This should start most changed units we stop here as # This should start most changed units we stop here as
# well as any new dependencies (including new mounts and # well as any new dependencies (including new mounts and
# swap devices). # swap devices). FIXME: the suspend target is sometimes
my $unitInfo = parseUnit($newUnitFile); # active after the system has resumed, which probably
unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "false")) { # should not be the case. Just ignore it.
write_file($restartListFile, { append => 1 }, "$unit\n"); if ($unit ne "suspend.target" && $unit ne "hibernate.target") {
my $unitInfo = parseUnit($newUnitFile);
unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "false")) {
write_file($restartListFile, { append => 1 }, "$unit\n");
}
} }
} elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) { } elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target") { if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target") {