various fixes, data subvols changed, mostly handled elsewhere now

[automated-distro-installer] / live-kexec

diff --git a/live-kexec b/live-kexec
index 10975a8f223790a4499a558ceacf58f869616ae6..fd4bf6fa924658c55b2773c0241a27148d85ecaf 100644 (file)
--- a/live-kexec
+++ b/live-kexec
@@ -14,13 +14,18 @@ set -ex
 if grep -q ID=ubuntu /etc/os-release; then
     sed -ri '/^\s*deb/{/universe/!s/$/ universe/}' /etc/apt/sources.list
 fi
-apt-get update
-apt-get install -y debconf
-debconf-set-selections <<EOF
+if ! type -p pxe-kexec &>/dev/null; then
+    apt-get update
+    apt-get install -y debconf
+    debconf-set-selections <<EOF
 kexec-tools kexec-tools/load_kexec boolean false
 EOF
-apt-get install -y pxe-kexec
-# at least on belanos, apt-get goes into the background,
-# and we need to wait for it to finish.
-sleep 5
+    apt-get install -y pxe-kexec
+fi
+# running this piped to bash on belanos, the apt-get goes
+# into the background while it's still installing, and pxe-kexec
+# just exits right away. sleep calls are strangely ignored.
+# I don't know whats going on, but just running the same
+# command again once it finishes works, and this is only
+# rarely used and done manually anyways, so whatever.
 pxe-kexec -n --ignore-whitelist -l fai-generated faiserver