projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove local overiddes of log_*_msg - #494257 is now fixed in testing.
[live-boot-grml.git]
/
hooks
/
live
diff --git
a/hooks/live
b/hooks/live
index
48802fc
..
dea7f0c
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-93,9
+93,9
@@
manual_add_modules squashfs
manual_add_modules sqlzma
manual_add_modules unlzma
manual_add_modules sqlzma
manual_add_modules unlzma
-# Filesystem: unionfs/aufs
-manual_add_modules unionfs
+# Filesystem: aufs/unionfs
manual_add_modules aufs
manual_add_modules aufs
+manual_add_modules unionfs
# Filesystem: vfat
manual_add_modules nls_cp437
# Filesystem: vfat
manual_add_modules nls_cp437
@@
-103,6
+103,9
@@
manual_add_modules nls_iso8859-1
manual_add_modules nls_utf8
manual_add_modules vfat
manual_add_modules nls_utf8
manual_add_modules vfat
+# Filesystem: ntfs
+manual_add_modules ntfs
+
# Hardware: cdrom
manual_add_modules ide-cd
manual_add_modules ide-generic
# Hardware: cdrom
manual_add_modules ide-cd
manual_add_modules ide-generic
@@
-126,8
+129,15
@@
fi
copy_exec /usr/bin/md5sum /bin
# Program: udev
copy_exec /usr/bin/md5sum /bin
# Program: udev
-copy_exec /sbin/udevadm /sbin
-copy_exec /sbin/udevsettle /sbin
+if [ -x /sbin/udevadm ]
+then
+ # lenny
+ copy_exec /sbin/udevadm /sbin
+else
+ # etch
+ copy_exec /sbin/udevtrigger /sbin
+ copy_exec /sbin/udevsettle /sbin
+fi
copy_exec /usr/bin/udevinfo /bin
# Program: wget
copy_exec /usr/bin/udevinfo /bin
# Program: wget
@@
-139,15
+149,13
@@
fi
# FUSE kernel module
manual_add_modules fuse
# FUSE kernel module
manual_add_modules fuse
-# FUSE filesystem: httpfs
-if [ -x /usr/bin/httpfs_ssl ]
+# FUSE filesystem: httpfs
2
+if [ -x /usr/bin/httpfs
2
_ssl ]
then
copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
then
copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
-else
- if [ -x /usr/bin/httpfs ]
- then
- copy_exec /usr/bin/httpfs2 /bin/httpfs
- fi
+elif [ -x /usr/bin/httpfs2 ]
+then
+ copy_exec /usr/bin/httpfs2 /bin/httpfs
fi
# FUSE filesystem: curlftpfs
fi
# FUSE filesystem: curlftpfs
@@
-155,4
+163,3
@@
if [ -x /usr/bin/curlftpfs ]
then
copy_exec /usr/bin/curlftpfs /bin
fi
then
copy_exec /usr/bin/curlftpfs /bin
fi
-