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.132.
[live-boot-grml.git]
/
hooks
/
live
diff --git
a/hooks/live
b/hooks/live
index
8cfc360
..
b85f646
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-46,6
+46,15
@@
copy_exec /usr/share/live-initramfs/live-preseed /bin
cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
+# klibc dependencies
+for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
+do
+ if [ ! -e "${DESTDIR}"/"${FILE}" ]
+ then
+ cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
+ fi
+done
+
# Handling other stuff
# Configuration: keymap (usefull when using encryption)
# Handling other stuff
# Configuration: keymap (usefull when using encryption)
@@
-74,10
+83,15
@@
fi
# Filesystem: ext3
manual_add_modules ext3
# Filesystem: ext3
manual_add_modules ext3
+# Filesystem: jffs2
+manual_add_modules jffs2
+
# Filesystem: squashfs
copy_exec /sbin/losetup /sbin
manual_add_modules loop
manual_add_modules squashfs
# Filesystem: squashfs
copy_exec /sbin/losetup /sbin
manual_add_modules loop
manual_add_modules squashfs
+manual_add_modules sqlzma
+manual_add_modules unlzma
# Filesystem: unionfs/aufs
manual_add_modules unionfs
# Filesystem: unionfs/aufs
manual_add_modules unionfs
@@
-96,6
+110,9
@@
manual_add_modules ohci1394
manual_add_modules sbp2
manual_add_modules sr_mod
manual_add_modules sbp2
manual_add_modules sr_mod
+# Hardware: usb
+manual_add_modules sd_mod
+
# Hardware: network
auto_add_modules net
# Hardware: network
auto_add_modules net
@@
-109,15
+126,6
@@
fi
copy_exec /usr/bin/md5sum /bin
# Program: udev
copy_exec /usr/bin/md5sum /bin
# Program: udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-then
- mkdir -p "${DESTDIR}"/lib/udev
-
- copy_exec /lib/udev/cdrom_id /lib/udev
- copy_exec /lib/udev/path_id /lib/udev
- copy_exec /lib/udev/vol_id /lib/udev
-fi
-
copy_exec /sbin/udevtrigger /sbin
copy_exec /sbin/udevsettle /sbin
copy_exec /usr/bin/udevinfo /bin
copy_exec /sbin/udevtrigger /sbin
copy_exec /sbin/udevsettle /sbin
copy_exec /usr/bin/udevinfo /bin