+casper (1.103) gutsy; urgency=low
+
+ * Disable anacron harder so that it doesn't get started by battery events.
+ * Don't write out DHCP network interface stanzas if network-manager is
+ installed (LP: #139403).
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 19 Sep 2007 12:52:21 +0100
+
casper (1.102) gutsy; urgency=low
* Rename 42disable_cups_apparmor to 42disable_apparmor and remove AppArmor's
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
EOF
- done
+ done
+ fi
if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ]
then
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
#
#EOF
#
-#done
+# done
+#fi
log_end_msg
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