Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-system into jenner

2 files changed, 21 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 339ab6a3..b7dc5875 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+vyatta-cfg-system (0.15.48+jenner1) unstable; urgency=low
+
+  [ Stephen Hemminger ]
+  * Print error message on failure to create group/user
+
+  [ Mohit Mehta ]
+  * move server,protocol to the same line in config file
+
+  [ An-Cheng Huang ]
+
+ -- An-Cheng Huang <ancheng@vyatta.com>  Fri, 29 May 2009 18:31:07 -0700
+
+vyatta-cfg-system (0.15.48) unstable; urgency=low
+
+  * Restore default facility for 'syslog console'
+  * Revert "Restore default facility for 'syslog console'"
+  * NTP management version 3
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Wed, 27 May 2009 10:12:45 -0700
+
 vyatta-cfg-system (0.15.47) unstable; urgency=low
 
   [ Jon Andersson ]
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 57f4b043..ec159432 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -7,13 +7,10 @@ bindir=@bindir@
 sbindir=@sbindir@
 
 # remove init of daemons that we start/stop
-for init in ssh snmpd openhpid vyatta-keepalived ipvsadm dnsmasq ddclient; do
+for init in ntp ssh snmpd openhpid vyatta-keepalived ipvsadm dnsmasq ddclient; do
   update-rc.d -f ${init} remove >/dev/null
 done
 
-# for upgrade make sure ntp is run during boot
-update-rc.d ntp defaults
-
 # remove extra call to clock setup only need one. this speeds up boot 
 # Mystery: why does Debian do it twice?
 if [ -L /etc/rcS.d/S08hwclockfirst.sh -a -L /etc/rcS.d/S11hwclock.sh ]; then