X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=backend%2Finitramfs-tools%2Flive.hook;h=d5765bb8fa72c0a1ec11a5c5298c6a98cb5cbf09;hb=5f1c62ad6a5f86419e88b0c570d240d9a1549ff6;hp=234f3342bb2d9977a7bd7883904deb6449feb4d2;hpb=44e7b72fa71425b02ec770b1f3429b27a5cf6c51;p=live-boot-grml.git

diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index 234f334..d5765bb 100755
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -16,6 +16,12 @@ do
 	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
@@ -105,16 +111,9 @@ manual_add_modules squashfs
 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 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
@@ -222,23 +221,26 @@ fi
 
 # 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 .