From fb16c6d813723df473c45dddba24266a4daf8edc Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sun, 24 May 2009 10:13:15 -0700 Subject: Fix post install script to adjust ntp.conf and net.agent ISO is still not coming out with correct Vyatta values. --- debian/vyatta-cfg-system.postinst.in | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index ce9e0a81..57f4b043 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -31,12 +31,6 @@ 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 @@ -115,10 +109,12 @@ EOF fi done - # replace debian /etc/ntp.conf - if [ -f $sysconfdir/ntp.conf ]; then - cp $sysconfdir/ntp.conf /etc/ntp.conf - fi + # replace debian /etc/ntp.conf with Vyatta version + cp $sysconfdir/ntp.conf /etc/ntp.conf + + # remove debian rules that use /etc/network/interfaces + # to avoid warning about missing ifup (bug 3885) + sed -i -e '/net.agent/s/^SUBSYSTEM/#&/' /etc/udev/rules.d/80-drivers.rules fi # update crontab for logrotate -- cgit v1.2.3