diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-22 10:14:56 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-22 10:14:56 -0700 |
| commit | c57e7d6d6832bb11e27e2f66f19c90334d6a633d (patch) | |
| tree | ae8dd14e6462223cea2fd9cbeaa261363c45d596 /debian | |
| parent | 7f66bb4464723113b4fe64ea804dc57bb16004c4 (diff) | |
| parent | e457435ce84923df3d93ceda0af9962126ab7aa9 (diff) | |
| download | vyatta-cfg-system-c57e7d6d6832bb11e27e2f66f19c90334d6a633d.tar.gz vyatta-cfg-system-c57e7d6d6832bb11e27e2f66f19c90334d6a633d.zip | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg-system into jenner
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index b49576d9..3b9d4d70 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 @@ -28,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 |