Apply PXE patch on our own networking script; readonly: use /dev/vd* as well v1.157.1-1grml.07
authorMichael Prokop <mika@grml.org>
Mon, 1 Jun 2009 23:07:24 +0000 (01:07 +0200)
committerMichael Prokop <mika@grml.org>
Mon, 1 Jun 2009 23:07:24 +0000 (01:07 +0200)
debian/changelog
debian/patches/08_readonly_devices.dpatch
debian/patches/09_fix_resolvconf_pxeboot.dpatch
grml/23networking

index 4f3060b..223e189 100644 (file)
@@ -1,3 +1,12 @@
+live-initramfs (1.157.1-1grml.07) unstable; urgency=low
+
+  * Apply PXE patch on our own networking script instead of
+    using upstream's file.
+  * Bootoption readonly: set all present virtio blockdevices
+    (/dev/vd*) to readonly as well (thanks, gebi).
+
+ -- Michael Prokop <mika@grml.org>  Tue, 02 Jun 2009 01:05:17 +0200
+
 live-initramfs (1.157.1-1grml.06) unstable; urgency=low
 
   * Apply bugfix contributed by Andreas Thienemann <andreas@bawue.net>:
index 7b15d6c..d42d0cf 100755 (executable)
@@ -62,7 +62,7 @@ diff -urNad live-initramfs-grml~/scripts/live-premount/readonly live-initramfs-g
 +# make sure all harddisk devices are read-only
 +# this is important for forensic investigations
 +if grep -qe forensic -qe readonly /proc/cmdline ; then
-+   for device in /dev/hd* /dev/sd* ; do
++   for device in /dev/hd* /dev/sd* /dev/vd* ; do
 +      if [ -b "$device" ] ; then
 +       printf " * Setting device %-9s to read-only mode: " $device >/dev/console
 +         blockdev --setro $device && printf "done [ execute \"blockdev --setrw %-9s\" to unlock]\n" $device >/dev/console || printf "failed\n" >/dev/console
index e15e21f..89bda0d 100755 (executable)
@@ -19,8 +19,8 @@
 @DPATCH@
 diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
 index 72aaf12..244eeca 100755
---- a/scripts/live-bottom/23networking
-+++ b/scripts/live-bottom/23networking
+--- a/grml/23networking
++++ b/grml/23networking
 @@ -110,6 +110,11 @@ EOF
        then
                if [ -f /netboot.config ]
index 6a66996..72aaf12 100755 (executable)
@@ -90,7 +90,7 @@ else
        fi
 
        # iterate the physical interfaces and add them to the interfaces list
-       if [ "${method}" != dhcp ] || [ ! -x /root/usr/sbin/NetworkManager ]
+       if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ])
        then
                for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
                do