projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.170.
[live-boot-grml.git]
/
hooks
/
live
diff --git
a/hooks/live
b/hooks/live
index
f2984f4
..
aa7b020
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-35,6
+35,9
@@
then
cp /etc/live.conf "${DESTDIR}"/etc
fi
cp /etc/live.conf "${DESTDIR}"/etc
fi
+mkdir -p "${DESTDIR}"/usr/share/live-initramfs
+cp /usr/share/live-initramfs/languagelist "${DESTDIR}"/usr/share/live-initramfs
+
# Directories
mkdir -p "${DESTDIR}"/lib/live-initramfs
# Directories
mkdir -p "${DESTDIR}"/lib/live-initramfs
@@
-55,6
+58,16
@@
do
fi
done
fi
done
+# udev dependencies (squeeze and newer)
+for FILE in /lib/udev/*_id
+do
+ if [ ! -e "${DESTDIR}/${FILE}" ]
+ then
+ mkdir -p "${DESTDIR}/lib/udev"
+ copy_exec "${FILE}" /lib/udev
+ fi
+done
+
# Handling other stuff
# Configuration: keymap (usefull when using encryption)
# Handling other stuff
# Configuration: keymap (usefull when using encryption)
@@
-80,12
+93,15
@@
then
manual_add_modules cifs
fi
manual_add_modules cifs
fi
-# Filesystem: ext3
+# Filesystem: ext3
/ext4
manual_add_modules ext3
manual_add_modules ext3
+manual_add_modules ext4
# Filesystem: jffs2
manual_add_modules jffs2
# Filesystem: jffs2
manual_add_modules jffs2
+copy_exec /usr/bin/rsync /bin
+
# Filesystem: squashfs
copy_exec /sbin/losetup /sbin
manual_add_modules loop
# Filesystem: squashfs
copy_exec /sbin/losetup /sbin
manual_add_modules loop
@@
-147,7
+163,10
@@
else
copy_exec /sbin/udevtrigger /sbin
copy_exec /sbin/udevsettle /sbin
fi
copy_exec /sbin/udevtrigger /sbin
copy_exec /sbin/udevsettle /sbin
fi
-copy_exec /usr/bin/udevinfo /bin
+if [ -x /usr/bin/udevinfo ]
+then
+ copy_exec /usr/bin/udevinfo /bin
+fi
# Program: wget
if [ -x /usr/bin/wget ]
# Program: wget
if [ -x /usr/bin/wget ]
@@
-155,6
+174,12
@@
then
copy_exec /usr/bin/wget /bin
fi
copy_exec /usr/bin/wget /bin
fi
+# Program: blockdev
+if [ -x /sbin/blockdev ]
+then
+ copy_exec /sbin/blockdev /sbin
+fi
+
# FUSE kernel module
manual_add_modules fuse
# FUSE kernel module
manual_add_modules fuse