projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing overzealous blacklist usage.
[live-boot-grml.git]
/
hooks
/
live
diff --git
a/hooks/live
b/hooks/live
index
c2292d5
..
93a2831
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.
conf.
d/* > /dev/null 2>&1
+if ls /etc/live/boot.d/* > /dev/null 2>&1
then
then
- for _FILE in /etc/live/boot.
conf.
d/*
+ for _FILE in /etc/live/boot.d/*
do
. ${_FILE}
done
do
. ${_FILE}
done
@@
-61,7
+61,7
@@
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
# klibc dependencies
for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
do
- if [ ! -e "${DESTDIR}"/"${FILE}" ]
+ if [ ! -e "${DESTDIR}"/"${FILE}" ]
&& ls ${FILE} > /dev/null 2>&1
then
cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
fi
then
cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
fi
@@
-246,3
+246,10
@@
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