From ad1e96cf5979756e4fb5335c170d8c14b54b49aa Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Fri, 17 Jul 2009 14:55:33 -0700 Subject: Revert earlier change -- keep debian net.agent Reopens bug 3985 but closes problems with loopback startup. (cherry picked from commit a139c41faf9ccc7210218fcdf637a234967a6136) Conflicts: debian/vyatta-cfg-system.postinst.in --- debian/vyatta-cfg-system.postinst.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 38757106..a756ba34 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -107,8 +107,9 @@ EOF fi done - # purge off ancient devfs stuff from /etc/securetty - cp $sysconfdir/securetty /etc/securetty + # replace debian /etc/ntp.conf with Vyatta version + cp $sysconfdir/ntp.conf /etc/ntp.conf + fi # update crontab for logrotate -- cgit v1.2.3