From: Daniel Baumann <daniel@debian.org>
Date: Sat, 3 Jul 2010 18:48:41 +0000 (+0200)
Subject: Adding preparations for booting through syslinux memdisk.
X-Git-Tag: debian/2.0_a12-1~6
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=99a3dc05824d23cbc684f3af43172f31af17bb8d

Adding preparations for booting through syslinux memdisk.
---

diff --git a/hooks/live b/hooks/live
index cba7120..4f11998 100755
--- a/hooks/live
+++ b/hooks/live
@@ -151,6 +151,13 @@ fi
 # Program: md5sum
 copy_exec /usr/bin/md5sum /bin
 
+# Program: memdisk
+if [ -x /usr/bin/memdiskfind ]
+then
+	copy_exec /usr/bin/memdiskfind
+	manual_add_modules phram mtdblock
+fi
+
 # Program: cpio
 # busybox and klibc lacks --no-absolute-filenames and --sparse, needed for snapshots
 if [ -e "${DESTDIR}/bin/cpio" ]
diff --git a/scripts/live b/scripts/live
index 412094a..5b5a3b9 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1704,6 +1704,20 @@ mountroot ()
 			# Do a local boot from hd
 			livefs_root=${ROOT}
 		else
+			if [ -x /usr/bin/memdiskfind ]
+			then
+				MEMDISK=$(/usr/bin/memdiskfind)
+
+				if [ $? -eq 0 ]
+				then
+					# We found a memdisk, set up phram
+					modprobe phram phram=memdisk,${MEMDISK}
+
+					# Load mtdblock, the memdisk will be /dev/mtdblock0
+					modprobe mtdblock
+				fi
+			fi
+
 			# Scan local devices for the image
 			i=0
 			while [ "$i" -lt 60 ]