[SCM] Debian Live initramfs hook branch, master, updated. 1.154.4-1-4-g26ca21e

Daniel Baumann daniel at debian.org
Sun Jan 11 13:47:24 UTC 2009


The following commit has been merged in the master branch:
commit f7b768f897bf869e49e346d92e4eb68baf0a456b
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 10 16:48:34 2009 +0100

    Also checking for wicd in 23networking, thanks to Ben Armstrong <synrg at debian.org>.

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 6a66996..cb2b9e5 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -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

-- 
Debian Live initramfs hook



More information about the debian-live-changes mailing list