movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Log the configuration when booting / switching

Browse source
This commit is contained in:
Eelco Dolstra 2013-02-18 15:39:02 +01:00
parent 202340e3f6
commit 18e8724e64
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/system/activation/switch-to-configuration.pl
View file

@ -4,8 +4,11 @@ use strict;
use warnings; use warnings;
use File::Basename; use File::Basename;
use File::Slurp; use File::Slurp;
use Sys::Syslog qw(:standard :macros);
use Cwd 'abs_path'; use Cwd 'abs_path';
my $out = "@out@";
my $startListFile = "/run/systemd/start-list"; my $startListFile = "/run/systemd/start-list";
my $restartListFile = "/run/systemd/restart-list"; my $restartListFile = "/run/systemd/restart-list";
my $reloadListFile = "/run/systemd/reload-list"; my $reloadListFile = "/run/systemd/reload-list";
@ -25,15 +28,17 @@ EOF
die "This is not a NixOS installation (/etc/NIXOS is missing)!\n" unless -f "/etc/NIXOS"; die "This is not a NixOS installation (/etc/NIXOS is missing)!\n" unless -f "/etc/NIXOS";
openlog("nixos", "", LOG_USER);
# Install or update the bootloader. # Install or update the bootloader.
if ($action eq "switch" || $action eq "boot") { if ($action eq "switch" || $action eq "boot") {
system("@installBootLoader@ @out@") == 0 or exit 1; system("@installBootLoader@ $out") == 0 or exit 1;
exit 0 if $action eq "boot"; exit 0 if $action eq "boot";
} }
# Check if we can activate the new configuration. # Check if we can activate the new configuration.
my $oldVersion = read_file("/run/current-system/init-interface-version", err_mode => 'quiet') // ""; my $oldVersion = read_file("/run/current-system/init-interface-version", err_mode => 'quiet') // "";
my $newVersion = read_file("@out@/init-interface-version"); my $newVersion = read_file("$out/init-interface-version");
if ($newVersion ne $oldVersion) { if ($newVersion ne $oldVersion) {
print STDERR <<EOF; print STDERR <<EOF;
@ -44,6 +49,8 @@ EOF
exit 100; exit 100;
} }
syslog(LOG_NOTICE, "switching to system configuration $out");
# Ignore SIGHUP so that we're not killed if we're running on (say) # Ignore SIGHUP so that we're not killed if we're running on (say)
# virtual console 1 and we restart the "tty1" unit. # virtual console 1 and we restart the "tty1" unit.
$SIG{PIPE} = "IGNORE"; $SIG{PIPE} = "IGNORE";
@ -106,7 +113,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
# Recognise template instances. # Recognise template instances.
$baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/; $baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/;
my $prevUnitFile = "/etc/systemd/system/$baseUnit"; my $prevUnitFile = "/etc/systemd/system/$baseUnit";
my $newUnitFile = "@out@/etc/systemd/system/$baseUnit"; my $newUnitFile = "$out/etc/systemd/system/$baseUnit";
my $baseName = $baseUnit; my $baseName = $baseUnit;
$baseName =~ s/\.[a-z]*$//; $baseName =~ s/\.[a-z]*$//;
@ -230,7 +237,7 @@ sub unique {
# we generated units for all mounts; then we could unify this with the # we generated units for all mounts; then we could unify this with the
# unit checking code above. # unit checking code above.
my ($prevFss, $prevSwaps) = parseFstab "/etc/fstab"; my ($prevFss, $prevSwaps) = parseFstab "/etc/fstab";
my ($newFss, $newSwaps) = parseFstab "@out@/etc/fstab"; my ($newFss, $newSwaps) = parseFstab "$out/etc/fstab";
foreach my $mountPoint (keys %$prevFss) { foreach my $mountPoint (keys %$prevFss) {
my $prev = $prevFss->{$mountPoint}; my $prev = $prevFss->{$mountPoint};
my $new = $newFss->{$mountPoint}; my $new = $newFss->{$mountPoint};
@ -276,7 +283,7 @@ print STDERR "NOT restarting the following units: ", join(", ", sort(@unitsToSki
# and so on). # and so on).
my $res = 0; my $res = 0;
print STDERR "activating the configuration...\n"; print STDERR "activating the configuration...\n";
system("@out@/activate", "@out@") == 0 or $res = 2; system("$out/activate", "$out") == 0 or $res = 2;
# Restart systemd if necessary. # Restart systemd if necessary.
if (abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd")) { if (abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd")) {
@ -342,4 +349,10 @@ if (scalar @failed > 0) {
$res = 4; $res = 4;
} }
if ($res == 0) {
syslog(LOG_NOTICE, "finished switching to system configuration $out");
} else {
syslog(LOG_ERR, "switching to system configuration $out failed (status $res)");
}
exit $res; exit $res;

3
modules/system/boot/stage-2-init.sh
View file

@ -42,6 +42,9 @@ if [ ! -e /proc/1 ]; then
fi fi
echo "booting system configuration $systemConfig" > /dev/kmsg
# Make /nix/store a read-only bind mount to enforce immutability of # Make /nix/store a read-only bind mount to enforce immutability of
# the Nix store. Note that we can't use "chown root:nixbld" here # the Nix store. Note that we can't use "chown root:nixbld" here
# because users/groups might not exist yet. # because users/groups might not exist yet.