projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Checking for file existence in initramfs hook (Closes: #595264).
[live-boot-grml.git]
/
hooks
/
live
diff --git
a/hooks/live
b/hooks/live
index
cebe9c9
..
19ff26a
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-30,9
+30,9
@@
then
. /etc/live/boot.conf
fi
. /etc/live/boot.conf
fi
-if ls /etc/live/boot.d/* > /dev/null 2>&1
+if ls /etc/live/boot.
conf.
d/* > /dev/null 2>&1
then
then
- for _FILE in /etc/live/boot.d/*
+ for _FILE in /etc/live/boot.
conf.
d/*
do
. ${_FILE}
done
do
. ${_FILE}
done
@@
-175,8
+175,7
@@
copy_exec /usr/bin/md5sum /bin
if [ -x /usr/bin/memdiskfind ]
then
copy_exec /usr/bin/memdiskfind
if [ -x /usr/bin/memdiskfind ]
then
copy_exec /usr/bin/memdiskfind
- manual_add_modules phram
- manual_add_modules mtdblock
+ manual_add_modules phram mtdblock
fi
# Program: cpio
fi
# Program: cpio
@@
-191,12
+190,7
@@
copy_exec /bin/cpio /bin
# Program: udev
if [ -x /sbin/udevadm ]
then
# Program: udev
if [ -x /sbin/udevadm ]
then
- # lenny
copy_exec /sbin/udevadm /sbin
copy_exec /sbin/udevadm /sbin
-else
- # etch
- copy_exec /sbin/udevtrigger /sbin
- copy_exec /sbin/udevsettle /sbin
fi
if [ -x /usr/bin/udevinfo ]
then
fi
if [ -x /usr/bin/udevinfo ]
then
@@
-252,10
+246,3
@@
then
#mkdir -p $DESTDIR/etc
#cp -p /etc/nsswitch.conf $DESTDIR/etc
fi
#mkdir -p $DESTDIR/etc
#cp -p /etc/nsswitch.conf $DESTDIR/etc
fi
-
-if [ "${LIVE_UNIONMOUNT}" = "true" ]
-then
- # UnionMount
- # only mount from patched util-linux can do this currently
- copy_exec /bin/mount /bin/mount_full
-fi