summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-05-23 09:05:26 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-05-23 09:05:26 -0700
commit5d970c24df617c3c19539360c3eb33f51505fd77 (patch)
tree7043cf695bf61191be93a2205503aac364f25e0a
parent4747eb29ae4568c45a26cd65750a88af3dd2c068 (diff)
downloadvyatta-cfg-system-5d970c24df617c3c19539360c3eb33f51505fd77.tar.gz
vyatta-cfg-system-5d970c24df617c3c19539360c3eb33f51505fd77.zip
Fix install rules
The edit of udev/rules.d had incorrect sed command. Setting up ntp.conf wasn't working right.
-rw-r--r--debian/vyatta-cfg-system.postinst.in7
1 files changed, 6 insertions, 1 deletions
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