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

switch-to-configuration: Print new units

Browse Source
This commit is contained in:
Eelco Dolstra 2012-08-03 17:13:34 -04:00
parent 320682a558
commit 2a91bb5282
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,18 +67,17 @@ system("@systemd@/bin/systemctl", "reset-failed");
# Stop all services that no longer exist or have changed in the new # Stop all services that no longer exist or have changed in the new
# configuration. # configuration.
my @unitsToStop; my @unitsToStop;
my $active = getActiveUnits; my $activePrev = getActiveUnits;
while (my ($unit, $state) = each %{$active}) { while (my ($unit, $state) = each %{$activePrev}) {
my $state = $active->{$unit};
my $baseUnit = $unit; my $baseUnit = $unit;
# Recognise template instances. # Recognise template instances.
$baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/; $baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/;
my $curUnitFile = "/etc/systemd/system/$baseUnit"; my $prevUnitFile = "/etc/systemd/system/$baseUnit";
if (-e $curUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
my $newUnitFile = "@out@/etc/systemd/system/$baseUnit"; my $newUnitFile = "@out@/etc/systemd/system/$baseUnit";
if (! -e $newUnitFile) { if (! -e $newUnitFile) {
push @unitsToStop, $unit; push @unitsToStop, $unit;
} elsif (abs_path($curUnitFile) ne abs_path($newUnitFile)) { } elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
# Record that this unit needs to be started below. We # Record that this unit needs to be started below. We
# write this to a file to ensure that the service gets # write this to a file to ensure that the service gets
# restarted if we're interrupted. # restarted if we're interrupted.
@ -88,9 +87,10 @@ while (my ($unit, $state) = each %{$active}) {
} }
} }
print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n"; if (scalar @unitsToStop > 0) {
system("@systemd@/bin/systemctl", "stop", @unitsToStop) print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
if scalar @unitsToStop > 0; # FIXME: ignore errors? system("@systemd@/bin/systemctl", "stop", @unitsToStop); # FIXME: ignore errors?
}
# Activate the new configuration (i.e., update /etc, make accounts, # Activate the new configuration (i.e., update /etc, make accounts,
# and so on). # and so on).
@ -123,12 +123,17 @@ if (scalar @stopped > 0) {
# Signal dbus to reload its configuration. # Signal dbus to reload its configuration.
system("@systemd@/bin/systemctl", "reload", "dbus.service"); system("@systemd@/bin/systemctl", "reload", "dbus.service");
# Check all the failed services. # Print failed and new units.
$active = getActiveUnits; my (@failed, @new);
my @failed; my $activeNew = getActiveUnits;
while (my ($unit, $state) = each %{$active}) { while (my ($unit, $state) = each %{$activeNew}) {
push @failed, $unit if $state->{state} eq "failed"; push @failed, $unit if $state->{state} eq "failed";
push @new, $unit if $state->{state} ne "failed" && !defined $activePrev->{$unit};
} }
print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n"
if scalar @new > 0;
if (scalar @failed > 0) { if (scalar @failed > 0) {
print STDERR "warning: the following units failed: ", join(", ", sort(@failed)), "\n"; print STDERR "warning: the following units failed: ", join(", ", sort(@failed)), "\n";
foreach my $unit (@failed) { foreach my $unit (@failed) {