From 5d970c24df617c3c19539360c3eb33f51505fd77 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sat, 23 May 2009 09:05:26 -0700 Subject: Fix install rules The edit of udev/rules.d had incorrect sed command. Setting up ntp.conf wasn't working right. --- debian/vyatta-cfg-system.postinst.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 3b9d4d70..ce9e0a81 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -34,7 +34,7 @@ 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 + sed -i -e '/net.agent/s/^SUBSYSTEM/#&/' /etc/udev/rules.d/80-drivers.rules fi if [ "$sysconfdir" != "/etc" ]; then @@ -114,6 +114,11 @@ EOF cp $sysconfdir/$f /etc/ssh/$f fi done + + # replace debian /etc/ntp.conf + if [ -f $sysconfdir/ntp.conf ]; then + cp $sysconfdir/ntp.conf /etc/ntp.conf + fi fi # update crontab for logrotate -- cgit v1.2.3