X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=backend%2Finitramfs-tools%2Flive.hook;h=ab843a7732da2c61e2f62534bb2e35418911069f;hb=refs%2Fheads%2Fmika%2Fdebian;hp=fc3d6b44c10e9f9bc61d4a6c9b31df5af53c7897;hpb=a09ea36d4fde0e56cd34a27716c25395ae41b116;p=live-boot-grml.git

diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index fc3d6b4..ab843a7 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
@@ -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}/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
@@ -215,23 +224,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 .