diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2009-07-17 14:55:33 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2009-07-17 14:55:33 -0700 |
| commit | ad1e96cf5979756e4fb5335c170d8c14b54b49aa (patch) | |
| tree | b31904e89b2f71a58113ef5903cc95f7faa8acfa | |
| parent | d020420a73a08bb6dbc217e1029a717d1fd0f137 (diff) | |
| download | vyatta-cfg-system-ad1e96cf5979756e4fb5335c170d8c14b54b49aa.tar.gz vyatta-cfg-system-ad1e96cf5979756e4fb5335c170d8c14b54b49aa.zip | |
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
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 5 |
1 files changed, 3 insertions, 2 deletions
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 |