Merging casper 1.103.

2 files changed, 18 insertions, 14 deletions

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index c6ec9cc..aeff351 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -82,10 +82,12 @@ else
 	fi
 
 	# iterate the physical interfaces and add them to the interfaces list
-	for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
-	do
-		[ -e $interface ] || continue
-		i="$(basename $interface)"
+	if [ "$method" != dhcp ] || [ ! -x /root/usr/sbin/NetworkManager ]
+	then
+		for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
+		do
+			[ -e $interface ] || continue
+			i="$(basename $interface)"
 
 cat >> "$IFFILE" << EOF
 auto $i
@@ -93,7 +95,8 @@ iface $i inet $method
 
 EOF
 
-	done
+		done
+	fi
 
 	if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ]
 	then
@@ -125,9 +128,11 @@ EOF
 	fi
 fi
 
-#for i in eth0 eth1 eth2 ath0 wlan0
-#do
-#	grep -q "iface $i" $IFFILE && continue
+#if [ ! -x /root/usr/sbin/NetworkManager ]
+#then
+#	for i in eth0 eth1 eth2 ath0 wlan0
+#	do
+#		grep -q "iface $i" $IFFILE && continue
 #
 #cat >> "$IFFILE" << EOF
 #auto $i
@@ -135,6 +140,7 @@ fi
 #
 #EOF
 #
-#done
+#	done
+#fi
 
 log_end_msg
diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index 1ed4445..e30261a 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -108,12 +108,10 @@ if [ -d /etc/rc0.d ]
 then
 	# This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
 	# /etc/crontab remaining disabled, yet also not run by anacron
-	if [ -x /root/etc/init.d/anacron ]
+	if [ -x /root/usr/sbin/anacron ]
 	then
-		for f in /root/etc/rc?.d/S??anacron
-		do
-			mv ${f} ${f%/*}/K00anacron
-		done
+		chroot /root dpkg-divert --add --rename --quiet /usr/sbin/anacron
+		ln -s /bin/true /usr/sbin/anacron
 	fi
 
 	# No point, really