movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/activation, switch-to-configuration-ng, doc: improve NIXOS_LUSTRATE installation experience (#349049)

Browse source
This commit is contained in:
misuzu 2024-12-01 19:16:26 +02:00 • committed by GitHub
commit 4b0caba2c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 54 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,10 +41,6 @@ use Fcntl ':flock';
my $out = "@out@";
# System closure path to switch to
my $toplevel = "@toplevel@";
# Path to the directory containing systemd tools of the old system
my $cur_systemd = abs_path("/run/current-system/sw/bin");
# Path to the systemd store path of the new system
my $new_systemd = "@systemd@";
# To be robust against interruption, record what units need to be started etc.
# We read these files again every time this script starts to make sure we continue
@ -130,6 +126,12 @@ if ($action eq "boot") {
exit(0);
}
# Path to the directory containing systemd tools of the old system
# Needs to be after the "boot" action exits, as this directory will not exist when doing a NIXOS_LUSTRATE install
my $cur_systemd = abs_path("/run/current-system/sw/bin");
# Path to the systemd store path of the new system
my $new_systemd = "@systemd@";
# Check if we can activate the new configuration.
my $cur_init_interface_version = read_file("/run/current-system/init-interface-version", err_mode => "quiet") // "";
my $new_init_interface_version = read_file("$toplevel/init-interface-version");