summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-07-03 20:48:41 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:53:26 +0100
commite08c082e758afa3341a9ebb6e00927d9873c7230 (patch)
tree1f2202163207c981a778dc5d14a82e0e7121cfcf
parent39c403857bc35a951c073b0add167872f80c7862 (diff)
downloadlive-boot-e08c082e758afa3341a9ebb6e00927d9873c7230.tar.gz
live-boot-e08c082e758afa3341a9ebb6e00927d9873c7230.zip
Adding preparations for booting through syslinux memdisk.
-rwxr-xr-xhooks/live7
-rwxr-xr-xscripts/live14
2 files changed, 21 insertions, 0 deletions
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 ]