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 live-initramfs 1.91.4-1.
[live-boot-grml.git]
/
hooks
/
live
diff --git
a/hooks/live
b/hooks/live
index
402f7ca
..
0ed58d8
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-47,39
+47,21
@@
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
-# Handling
binaries
+# Handling
other stuff
-# losetup
-copy_exec /sbin/losetup /sbin
-
-# mount.cifs
-if [ -x /sbin/mount.cifs ]
-then
- copy_exec /sbin/mount.cifs /sbin
-fi
-
-# eject
-copy_exec /usr/bin/eject /bin
-
-# udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+# Configuration: keymap (usefull when using encryption)
+if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
then
then
- mkdir -p "${DESTDIR}"/lib/udev
+ copy_exec /bin/loadkeys /bin
- copy_exec /lib/udev/cdrom_id /lib/udev
- copy_exec /lib/udev/path_id /lib/udev
- copy_exec /lib/udev/vol_id /lib/udev
+ mkdir -p "${DESTDIR}"/etc
+ cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
fi
fi
-copy_exec /sbin/udevtrigger /sbin
-copy_exec /sbin/udevsettle /sbin
-copy_exec /usr/bin/udevinfo /bin
-
-# Handling kernel modules
-
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
+ copy_exec /sbin/mount.cifs /sbin
manual_add_modules cifs
fi
manual_add_modules cifs
fi
@@
-87,11
+69,13
@@
fi
manual_add_modules ext3
# Filesystem: squashfs
manual_add_modules ext3
# Filesystem: squashfs
+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
@@
-101,6
+85,7
@@
manual_add_modules vfat
# Hardware: cdrom
manual_add_modules ide-cd
# Hardware: cdrom
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
@@
-108,11
+93,22
@@
manual_add_modules sr_mod
# Hardware: network
auto_add_modules net
# Hardware: network
auto_add_modules net
-#
Custom keymap (usefull when using encryption)
-if [ -x /
bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz
]
+#
Program: eject
+if [ -x /
usr/bin/eject
]
then
then
- copy_exec /bin/loadkeys /bin
+ copy_exec /usr/bin/eject /bin
+fi
- mkdir -p "${DESTDIR}"/etc
- cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
+# 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
fi
+
+copy_exec /sbin/udevtrigger /sbin
+copy_exec /sbin/udevsettle /sbin
+copy_exec /usr/bin/udevinfo /bin