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 d5765bb..e08216e 100755 (executable)
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -39,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}/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
@@ -236,11 +239,4 @@ done
 #mkdir -p "${DESTDIR}/etc"
 #cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
 
-# vlan support
-if [ -x /sbin/vconfig ]
-then
-       copy_exec /sbin/vconfig
-       manual_add_modules 8021q
-fi
-
 [ "${QUIET}" ] || echo .