projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify mount point handling by using /run/live instead of /lib/live/mount
[live-boot-grml.git]
/
backend
/
initramfs-tools
/
live.hook
diff --git
a/backend/initramfs-tools/live.hook
b/backend/initramfs-tools/live.hook
index
234f334
..
761849e
100755
(executable)
--- a/
backend/initramfs-tools/live.hook
+++ b/
backend/initramfs-tools/live.hook
@@
-8,7
+8,7
@@
set -e
# Reading configuration file from filesystem and live-media
for _FILE in /etc/live/boot.conf /etc/live/boot/* \
# Reading configuration file from filesystem and live-media
for _FILE in /etc/live/boot.conf /etc/live/boot/* \
- /
lib/live/mount/media/live/boot.conf /lib/live/mount/media
/live/boot/*
+ /
run/live/medium/live/boot.conf /run/live/medium
/live/boot/*
do
if [ -e "${_FILE}" ]
then
do
if [ -e "${_FILE}" ]
then
@@
-28,11
+28,21
@@
fi
[ "${QUIET}" ] || echo -n " core"
mkdir -p "${DESTDIR}/bin"
[ "${QUIET}" ] || echo -n " core"
mkdir -p "${DESTDIR}/bin"
-cp -a /bin/live-boot
/lib/live/boot
"${DESTDIR}/bin"
+cp -a /bin/live-boot "${DESTDIR}/bin"
mkdir -p "${DESTDIR}/lib/live"
cp -a /lib/live/boot "${DESTDIR}/lib/live"
mkdir -p "${DESTDIR}/lib/live"
cp -a /lib/live/boot "${DESTDIR}/lib/live"
+mkdir -p "${DESTDIR}/etc/live"
+if [ -e /etc/live/boot.conf ]
+then
+ cp -a /etc/live/boot.conf "${DESTDIR}/etc/live"
+fi
+if [ -e /etc/live/boot ]
+then
+ cp -a /etc/live/boot "${DESTDIR}/etc/live"
+fi
+
# 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
@@
-105,21
+115,15
@@
manual_add_modules squashfs
manual_add_modules sqlzma
manual_add_modules unlzma
manual_add_modules sqlzma
manual_add_modules unlzma
-# Filesystem: aufs/overlay
/unionfs
+# Filesystem: aufs/overlay
manual_add_modules aufs
manual_add_modules overlay
manual_add_modules aufs
manual_add_modules overlay
-manual_add_modules unionfs
-
-# Filesystem: unionfs-fuse
-if [ -x /usr/bin/unionfs-fuse ]
-then
- copy_exec /usr/bin/unionfs-fuse /bin
-fi
# Filesystem: vfat
manual_add_modules nls_cp437
manual_add_modules nls_iso8859-1
manual_add_modules nls_utf8
# Filesystem: vfat
manual_add_modules nls_cp437
manual_add_modules nls_iso8859-1
manual_add_modules nls_utf8
+manual_add_modules nls_ascii
manual_add_modules vfat
# Filesystem: ntfs
manual_add_modules vfat
# Filesystem: ntfs
@@
-169,17
+173,10
@@
then
fi
# Program: udev
fi
# Program: udev
-if [ -x /
s
bin/udevadm ]
+if [ -x /bin/udevadm ]
then
[ "${QUIET}" ] || echo -n " udev"
then
[ "${QUIET}" ] || echo -n " udev"
- copy_exec /sbin/udevadm
-fi
-
-# Program: wget
-if [ -x /usr/bin/wget ]
-then
- [ "${QUIET}" ] || echo -n " wget"
- copy_exec /usr/bin/wget /bin
+ copy_exec /bin/udevadm
fi
# Program: blockdev
fi
# Program: blockdev
@@
-222,23
+219,19
@@
fi
# Some experimental stuff
# Some experimental stuff
-case "${LIVE_DNS}" in
- true)
- [ "${QUIET}" ] || echo -n " dns"
+[ "${QUIET}" ] || echo -n " dns"
-
# /lib/libnss_dns.so.*:a DNS
-
# /lib/libnss_files.so.*: /etc/hosts and /etc/passwd
-
# /lib/libnss_compat.so.*: /etc/passwd
+# /lib/libnss_dns.so.*:a DNS
+# /lib/libnss_files.so.*: /etc/hosts and /etc/passwd
+# /lib/libnss_compat.so.*: /etc/passwd
-
for _SHLIB in $(find /lib -name 'libnss_dns.so.*')
-
do
-
copy_exec "${_SHLIB}"
-
done
+for _SHLIB in $(find /lib -name 'libnss_dns.so.*')
+do
+ copy_exec "${_SHLIB}"
+done
- # might be needed if /etc/hosts is used
- #mkdir -p "${DESTDIR}/etc"
- #cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
- ;;
-esac
+# might be needed if /etc/hosts is used
+#mkdir -p "${DESTDIR}/etc"
+#cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
[ "${QUIET}" ] || echo .
[ "${QUIET}" ] || echo .