projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding upstream version 1.110.7.
[live-boot-grml.git]
/
hooks
/
live
diff --git
a/hooks/live
b/hooks/live
index
e94590d
..
5d9de44
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-39,7
+39,6
@@
fi
mkdir -p "${DESTDIR}"/lib/live-initramfs
# Executables
mkdir -p "${DESTDIR}"/lib/live-initramfs
# Executables
-copy_exec /usr/lib/live-initramfs/live-md5check /bin
copy_exec /usr/share/live-initramfs/live-reconfigure /bin
copy_exec /usr/share/live-initramfs/live-preseed /bin
copy_exec /usr/share/live-initramfs/live-reconfigure /bin
copy_exec /usr/share/live-initramfs/live-preseed /bin
@@
-58,6
+57,13
@@
then
cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
fi
cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
fi
+# Configuration: Unique ID
+if [ -n "${LIVE_GENERATE_UUID}" ]
+then
+ mkdir -p "${DESTDIR}"/conf
+ uuidgen -r > "${DESTDIR}"/conf/uuid.conf
+fi
+
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
@@
-73,8
+79,9
@@
copy_exec /sbin/losetup /sbin
manual_add_modules loop
manual_add_modules squashfs
manual_add_modules loop
manual_add_modules squashfs
-# Filesystem: unionfs
+# Filesystem: unionfs
/aufs
manual_add_modules unionfs
manual_add_modules unionfs
+manual_add_modules aufs
# Filesystem: vfat
manual_add_modules nls_cp437
# Filesystem: vfat
manual_add_modules nls_cp437
@@
-83,8
+90,8
@@
manual_add_modules nls_utf8
manual_add_modules vfat
# Hardware: cdrom
manual_add_modules vfat
# Hardware: cdrom
-force_load ide-generic
manual_add_modules ide-cd
manual_add_modules ide-cd
+manual_add_modules ide-generic
manual_add_modules ohci1394
manual_add_modules sbp2
manual_add_modules sr_mod
manual_add_modules ohci1394
manual_add_modules sbp2
manual_add_modules sr_mod
@@
-93,18
+100,21
@@
manual_add_modules sr_mod
auto_add_modules net
# Program: eject
auto_add_modules net
# Program: eject
-copy_exec /usr/bin/eject /bin
-
-# Program: udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+if [ -x /usr/bin/eject ]
then
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
+ copy_exec /usr/bin/eject /bin
fi
fi
+# Program: md5sum
+copy_exec /usr/bin/md5sum /bin
+
+# Program: udev
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
+
+# Program: wget
+if [ -x /usr/bin/wget ]
+then
+ copy_exec /usr/bin/wget /bin
+fi