Readd scripts/live-bottom/05mountpoints; Improve boot failure splash

diff --git a/debian/changelog b/debian/changelog
index 18a9aca..fed8464 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 live-initramfs (1.136.3-2~grml.03) unstable; urgency=low
 
   * Improve boot failure splash.
+  * Readd scripts/live-bottom/05mountpoints, otherwise
+    we suffer from "run-init: nuking initramfs contents".
 
- -- Michael Prokop <mika@grml.org>  Sat, 16 Aug 2008 12:31:22 +0200
+ -- Michael Prokop <mika@grml.org>  Sat, 16 Aug 2008 15:19:05 +0200
 
 live-initramfs (1.136.3-2~grml.02) unstable; urgency=low
 

diff --git a/debian/patches/06_grml_version_file.dpatch b/debian/patches/06_grml_version_file.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/scripts/live-bottom/05mountpoints b/scripts/live-bottom/05mountpoints
new file mode 100755 (executable)
index 0000000..a334af8
--- /dev/null
+++ b/scripts/live-bottom/05mountpoints
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+#set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+       echo "${PREREQ}"
+}
+
+case "${1}" in
+       prereqs)
+               prereqs
+               exit 0
+               ;;
+esac
+
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Moving mount points..."
+
+# live-initramfs script
+
+# Move to the new root filesystem so that programs there can get at it.
+if [ ! -d /root/live/image ]
+then
+       mkdir -p /root/live/image
+       mount -n --move /live/image /root/live/image
+fi
+
+log_end_msg