From a999d5dedfc4b5cf1fed6e5bf4819cb0d9db85bb Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 22 May 2009 10:11:38 -0700
Subject: Run ntp during boot

Go back to running ntp during boot because ntp.conf always exists
---
 debian/vyatta-cfg-system.postinst.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'debian/vyatta-cfg-system.postinst.in')

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index b49576d9..ffea6e93 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -7,10 +7,13 @@ bindir=@bindir@
 sbindir=@sbindir@
 
 # remove init of daemons that we start/stop
-for init in ntp ssh snmpd openhpid vyatta-keepalived ipvsadm dnsmasq ddclient; do
+for init in ssh snmpd openhpid vyatta-keepalived ipvsadm dnsmasq ddclient; do
   update-rc.d -f ${init} remove >/dev/null
 done
 
+# for upgrade make sure ntp is run during boot
+update-rc.d ntp defaults
+
 # remove extra call to clock setup only need one. this speeds up boot 
 # Mystery: why does Debian do it twice?
 if [ -L /etc/rcS.d/S08hwclockfirst.sh -a -L /etc/rcS.d/S11hwclock.sh ]; then
-- 
cgit v1.2.3


From e457435ce84923df3d93ceda0af9962126ab7aa9 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 22 May 2009 10:12:37 -0700
Subject: Don't run net.agent

By default, vyatta doesn't have package ifupdown, so no need
for net.agent

Bug 3885
---
 debian/vyatta-cfg-system.postinst.in | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'debian/vyatta-cfg-system.postinst.in')

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index ffea6e93..3b9d4d70 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -31,6 +31,12 @@ esac
 
 ln -sf ../vyatta-net.rules /etc/udev/rules.d/$vyatta_net_rules
 
+# remove debian rules that use /etc/network/interfaces
+# to avoid warning about missing ifup (bug 3885)
+if [ -x /sbin/ifup ]; then
+  sed -i -e 'net.agent/s/^SUBSYSTEM/#&/' /etc/udev/rules.d/80-drivers.rules
+fi
+
 if [ "$sysconfdir" != "/etc" ]; then
     touch /etc/sudoers
     cp -p /etc/sudoers /etc/sudoers.bak
-- 
cgit v1.2.3