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 1817814..ef148b6 100755 (executable)
--- 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
@@ -251,4 +257,11 @@ then
        echo "hosts: files dns" > "${DESTDIR}/etc/nsswitch.conf"
 fi
 
+# vlan support
+if [ -x /sbin/vconfig ]
+then
+       copy_exec /sbin/vconfig
+       manual_add_modules 8021q
+fi
+
 [ "${QUIET}" ] || echo .