Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0784d26de3c6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 387a2f27ec36
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 16, 2019

  1. Revert systemd interface version to 2 

    The new systemd in 19.09 gives an "Access Denied" error when doing
"systemctl daemon-reexec" on an 19.03 system. The fix is to use the
previous systemctl to signal the daemon to re-exec itself. This
ensures that users don't have to reboot when upgrading from NixOS
19.03 to 19.09.
    @edolstra
    edolstra committed Sep 16, 2019
    9
    Copy the full SHA
    b20a0e4 View commit details

Commits on Sep 19, 2019

  1. Merge pull request #68906 from edolstra/revert-interface-version 

    Revert systemd interface version to 2
    @edolstra
    edolstra authored Sep 19, 2019
    Copy the full SHA
    387a2f2 View commit details
Showing with 14 additions and 7 deletions.
  1. +13 −6 nixos/modules/system/activation/switch-to-configuration.pl
  2. +1 −1 pkgs/os-specific/linux/systemd/default.nix
19 changes: 13 additions & 6 deletions nixos/modules/system/activation/switch-to-configuration.pl
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@

my $out = "@out@";

# FIXME: maybe we should use /proc/1/exe to get the current systemd.
my $curSystemd = abs_path("/run/current-system/sw/bin");

# To be robust against interruption, record what units need to be started etc.
my $startListFile = "/run/systemd/start-list";
my $restartListFile = "/run/systemd/restart-list";
@@ -267,7 +270,7 @@ sub fingerprintUnit {
sub pathToUnitName {
my ($path) = @_;
# Use current version of systemctl binary before daemon is reexeced.
open my $cmd, "-|", "/run/current-system/sw/bin/systemd-escape", "--suffix=mount", "-p", $path
open my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path
or die "Unable to escape $path!\n";
my $escaped = join "", <$cmd>;
chomp $escaped;
@@ -370,7 +373,7 @@ sub filterUnits {
print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n"
if scalar @unitsToStopFiltered;
# Use current version of systemctl binary before daemon is reexeced.
system("/run/current-system/sw/bin/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors?
system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors?
}

print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n"
@@ -382,10 +385,12 @@ sub filterUnits {
print STDERR "activating the configuration...\n";
system("$out/activate", "$out") == 0 or $res = 2;

# Restart systemd if necessary.
# Restart systemd if necessary. Note that this is done using the
# current version of systemd, just in case the new one has trouble
# communicating with the running pid 1.
if ($restartSystemd) {
print STDERR "restarting systemd...\n";
system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2;
system("$curSystemd/systemctl", "daemon-reexec") == 0 or $res = 2;
}

# Forget about previously failed services.
@@ -401,8 +406,10 @@ sub filterUnits {
my ($uid, $name) = ($+{uid}, $+{user});
print STDERR "reloading user units for $name...\n";

system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user start nixos-activation.service");
system("@su@", "-s", "@shell@", "-l", $name, "-c",
"export XDG_RUNTIME_DIR=/run/user/$uid; " .
"$curSystemd/systemctl --user daemon-reexec; " .
"@systemd@/bin/systemctl --user start nixos-activation.service");
}

close $listActiveUsers;
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -223,7 +223,7 @@ in stdenv.mkDerivation {
# in a backwards-incompatible way. If the interface version of two
# systemd builds is the same, then we can switch between them at
# runtime; otherwise we can't and we need to reboot.
passthru.interfaceVersion = 3;
passthru.interfaceVersion = 2;

meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/systemd;