diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-14 16:00:23 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-14 16:00:23 +0100 |
| commit | ca441636f1a21a68d053e11a815c16f531deba29 (patch) | |
| tree | 5ec8d9bf10d2278e6fa891b2d286f5f0281332fd /nixos/modules/system | |
| parent | 03d828a976628c0aa8cd5abcca4ba9364aea9768 (diff) | |
| parent | bf17f43fe96e454d748261f6d1bcf84a29ca2cf1 (diff) | |
| download | nixlib-ca441636f1a21a68d053e11a815c16f531deba29.tar nixlib-ca441636f1a21a68d053e11a815c16f531deba29.tar.gz nixlib-ca441636f1a21a68d053e11a815c16f531deba29.tar.bz2 nixlib-ca441636f1a21a68d053e11a815c16f531deba29.tar.lz nixlib-ca441636f1a21a68d053e11a815c16f531deba29.tar.xz nixlib-ca441636f1a21a68d053e11a815c16f531deba29.tar.zst nixlib-ca441636f1a21a68d053e11a815c16f531deba29.zip | |
Merge branch 'staging'
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 6 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index da1963f98043..071eb8ee874c 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -372,7 +372,11 @@ exec 3>&- # Emit a udev rule for /dev/root to prevent systemd from complaining. -eval $(udevadm info --export --export-prefix=ROOT_ --device-id-of-file=$targetRoot || true) +if [ -e /mnt-root/iso ]; then + eval $(udevadm info --export --export-prefix=ROOT_ --device-id-of-file=/mnt-root/iso || true) +else + eval $(udevadm info --export --export-prefix=ROOT_ --device-id-of-file=$targetRoot || true) +fi if [ "$ROOT_MAJOR" -a "$ROOT_MINOR" -a "$ROOT_MAJOR" != 0 ]; then mkdir -p /run/udev/rules.d echo 'ACTION=="add|change", SUBSYSTEM=="block", ENV{MAJOR}=="'$ROOT_MAJOR'", ENV{MINOR}=="'$ROOT_MINOR'", SYMLINK+="root"' > /run/udev/rules.d/61-dev-root-link.rules diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 45229e871ab6..cf2114046498 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -34,6 +34,8 @@ let doublePatchelf = pkgs.stdenv.isArm; } '' + set +o pipefail + mkdir -p $out/bin $out/lib ln -s $out/bin $out/sbin diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index c1205dc0c447..8a86149a9e12 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -85,6 +85,7 @@ let "systemd-journal-flush.service" "systemd-journal-gatewayd.socket" "systemd-journal-gatewayd.service" + "systemd-journald-dev-log.socket" "syslog.socket" # SysV init compatibility. |