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

switch-to-configuration: Restart all active targets

Browse Source
This commit is contained in:
Eelco Dolstra 2012-08-20 16:19:03 -04:00
parent 3f4ffffed7
commit f3def8194e
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,11 @@ sub parseUnit {
return $info; return $info;
} }
sub boolIsTrue {
my ($s) = @_;
return $s eq "yes" || $s eq "true";
}
# Forget about previously failed services. # Forget about previously failed services.
system("@systemd@/bin/systemctl", "reset-failed"); system("@systemd@/bin/systemctl", "reset-failed");
@ -102,11 +107,18 @@ while (my ($unit, $state) = each %{$activePrev}) {
if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
if (! -e $newUnitFile) { if (! -e $newUnitFile) {
push @unitsToStop, $unit; push @unitsToStop, $unit;
} elsif ($unit =~ /\.target$/) {
# Cause all active target units to be restarted below.
# This should start most changed units we stop here as
# well as any new dependencies (including new mounts and
# swap devices).
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") {
# Do nothing. These cannot be restarted directly. # Do nothing. These cannot be restarted directly.
} elsif ($unit =~ /\.target$/) {
write_file($restartListFile, { append => 1 }, "$unit\n");
} elsif ($unit =~ /\.mount$/) { } elsif ($unit =~ /\.mount$/) {
# Reload the changed mount unit to force a remount. # Reload the changed mount unit to force a remount.
write_file($reloadListFile, { append => 1 }, "$unit\n"); write_file($reloadListFile, { append => 1 }, "$unit\n");
@ -114,7 +126,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
# FIXME: do something? # FIXME: do something?
} else { } else {
my $unitInfo = parseUnit($newUnitFile); my $unitInfo = parseUnit($newUnitFile);
if (($unitInfo->{'X-RestartIfChanged'} // "true") eq "false") { if (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "true")) {
push @unitsToSkip, $unit; push @unitsToSkip, $unit;
} else { } else {
# Record that this unit needs to be started below. We # Record that this unit needs to be started below. We
@ -194,19 +206,13 @@ sub unique {
return sort(keys(%unique)); return sort(keys(%unique));
} }
# Start the following units: # Start all active targets, as well as changed units we stopped above.
# - The default target. This should start most changed units we # The latter is necessary because some may not be dependencies of the
# stopped above as well as any new dependencies. # targets (i.e., they were manually started). FIXME: detect units
# - local-fs.target. This mounts any missing local filesystems. # that are symlinks to other units. We shouldn't start both at the
# - Changed units we stopped above. This is necessary because some # same time because we'll get a "Failed to add path to set" error from
# may not be dependencies of the default target (i.e., they were # systemd.
# manually started). my @start = unique("default.target", split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
# FIXME: detect units that are symlinks to other units. We shouldn't
# start both at the same time because we'll get a "Failed to add path
# to set" error from systemd.
my @start = unique(
"default.target", "local-fs.target", "swap.target",
split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
print STDERR "starting the following units: ", join(", ", @start), "\n"; print STDERR "starting the following units: ", join(", ", @start), "\n";
system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4; system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
unlink($restartListFile); unlink($restartListFile);