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 8337a64..ab843a7 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
@@ -233,4 +239,11 @@ 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 .