projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master'
[live-boot-grml.git]
/
backend
/
initramfs-tools
/
live.hook
diff --git
a/backend/initramfs-tools/live.hook
b/backend/initramfs-tools/live.hook
index
76f4218
..
ab843a7
100755
(executable)
--- a/
backend/initramfs-tools/live.hook
+++ b/
backend/initramfs-tools/live.hook
@@
-16,6
+16,12
@@
do
fi
done
fi
done
+# Grml version information:
+if [ -r /etc/grml_version ]
+then
+ cp /etc/grml_version "${DESTDIR}"/etc
+fi
+
# Checking live-boot
if [ ! -e /bin/live-boot ]
then
# Checking live-boot
if [ ! -e /bin/live-boot ]
then
@@
-33,6
+39,9
@@
cp -a /bin/live-boot /lib/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"
+cp -a /etc/live/boot.conf /etc/live/boot "${DESTDIR}/etc/live"
+
# 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,16
+114,9
@@
manual_add_modules squashfs
manual_add_modules sqlzma
manual_add_modules unlzma
manual_add_modules sqlzma
manual_add_modules unlzma
-# Filesystem: aufs/overlay
fs/unionfs
+# Filesystem: aufs/overlay
manual_add_modules aufs
manual_add_modules aufs
-manual_add_modules overlayfs
-manual_add_modules unionfs
-
-# Filesystem: unionfs-fuse
-if [ -x /usr/bin/unionfs-fuse ]
-then
- copy_exec /usr/bin/unionfs-fuse /bin
-fi
+manual_add_modules overlay
# Filesystem: vfat
manual_add_modules nls_cp437
# Filesystem: vfat
manual_add_modules nls_cp437
@@
-222,23
+224,26
@@
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"
- # might be needed if /etc/hosts is used
- #mkdir -p "${DESTDIR}/etc"
- #cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
- ;;
-esac
+# vlan support
+if [ -x /sbin/vconfig ]
+then
+ copy_exec /sbin/vconfig
+ manual_add_modules 8021q
+fi
[ "${QUIET}" ] || echo .
[ "${QUIET}" ] || echo .