From 4d667685c24c3e99cc70156f3172d5ed5f2ceaa6 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 26 Apr 2019 00:33:40 +0200
Subject: nixos/kexec: don't clobber existing kexec-loaded kernel

---
 nixos/modules/system/boot/kexec.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nixos/modules')

diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index 61f9c6d0e7eb..ecbeea74ab8e 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -13,6 +13,9 @@
         path = [ pkgs.kexectools ];
         script =
           ''
+            # Don't load the current system profile if we already have a kernel loaded
+            [[ 1 = "$(</sys/kernel/kexec_loaded)" ]] && exit
+
             p=$(readlink -f /nix/var/nix/profiles/system)
             if ! [ -d $p ]; then exit 1; fi
             exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"
-- 
cgit 1.4.1


From 6b6f25e92638174a2bb3e9338b830df3bbe5cf45 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 29 Apr 2019 22:43:16 +0200
Subject: nixos/kexec: log what's happening

---
 nixos/modules/system/boot/kexec.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'nixos/modules')

diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index ecbeea74ab8e..fd2cb94b756b 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -14,10 +14,17 @@
         script =
           ''
             # Don't load the current system profile if we already have a kernel loaded
-            [[ 1 = "$(</sys/kernel/kexec_loaded)" ]] && exit
+            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"
           '';
       };
-- 
cgit 1.4.1