projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7cadb84
)
Adding preparations for booting through syslinux memdisk.
author
Daniel Baumann
<daniel@debian.org>
Sat, 3 Jul 2010 18:48:41 +0000
(20:48 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Mon, 5 Jul 2010 21:17:10 +0000
(23:17 +0200)
hooks/live
patch
|
blob
|
history
scripts/live
patch
|
blob
|
history
diff --git
a/hooks/live
b/hooks/live
index
cba7120
..
4f11998
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-151,6
+151,13
@@
fi
# Program: md5sum
copy_exec /usr/bin/md5sum /bin
# 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" ]
# 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
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-1704,6
+1704,20
@@
mountroot ()
# Do a local boot from hd
livefs_root=${ROOT}
else
# 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 ]
# Scan local devices for the image
i=0
while [ "$i" -lt 60 ]