about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2019-05-06 21:53:47 +0200
committerGitHub <noreply@github.com>2019-05-06 21:53:47 +0200
commit864f4f084a87588fc1bc43ccb5a5b12e49dfe68e (patch)
tree2ad453f0e6c0498588363b5e5669146ea70ab8cb /nixos/modules
parent47a8f9d8838fd9382f460a88a7cd3bbc3926cfba (diff)
parent6b6f25e92638174a2bb3e9338b830df3bbe5cf45 (diff)
downloadnixlib-864f4f084a87588fc1bc43ccb5a5b12e49dfe68e.tar
nixlib-864f4f084a87588fc1bc43ccb5a5b12e49dfe68e.tar.gz
nixlib-864f4f084a87588fc1bc43ccb5a5b12e49dfe68e.tar.bz2
nixlib-864f4f084a87588fc1bc43ccb5a5b12e49dfe68e.tar.lz
nixlib-864f4f084a87588fc1bc43ccb5a5b12e49dfe68e.tar.xz
nixlib-864f4f084a87588fc1bc43ccb5a5b12e49dfe68e.tar.zst
nixlib-864f4f084a87588fc1bc43ccb5a5b12e49dfe68e.zip
Merge pull request #60237 from mayflower/kexec-no-clobber
nixos/kexec: don't clobber existing kexec-loaded kernel
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/system/boot/kexec.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index 61f9c6d0e7eb..fd2cb94b756b 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -13,8 +13,18 @@
         path = [ pkgs.kexectools ];
         script =
           ''
+            # Don't load the current system profile if we already have a kernel loaded
+            if [[ 1 = "$(</sys/kernel/kexec_loaded)" ]] ; then
+              echo "kexec kernel has already been loaded, prepare-kexec skipped"
+              exit 0
+            fi
+
             p=$(readlink -f /nix/var/nix/profiles/system)
-            if ! [ -d $p ]; then exit 1; fi
+            if ! [[ -d $p ]]; then
+              echo "Could not find system profile for prepare-kexec"
+              exit 1
+            fi
+            echo "Loading NixOS system via kexec."
             exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"
           '';
       };