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

1 files changed, 9 insertions, 2 deletions

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 1a9f0bd5..95fcd1ca 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -6,8 +6,10 @@ sysconfdir=@sysconfdir@
 bindir=@bindir@
 sbindir=@sbindir@
 
-# remove init of daemons that we start/stop
-for init in ntp ssh snmpd openhpid vyatta-keepalived ipvsadm dnsmasq ddclient; do
+# remove init of daemons that are controlled by Vyatta configuration process
+for init in ntp ssh snmpd openhpid \
+            vyatta-keepalived ipvsadm dnsmasq ddclient radvd
+do
   update-rc.d -f ${init} remove >/dev/null
 done
 
@@ -115,6 +117,7 @@ EOF
             cp $sysconfdir/$f /etc/$f
         fi
     done
+
 fi
 
 # update crontab for logrotate
@@ -124,6 +127,7 @@ rm /etc/crontab
 mv /etc/crontab.$$ /etc/crontab
 crontab /etc/crontab
 
+
 # create needed directories
 mkdir -p /var/log/user
 
@@ -144,6 +148,9 @@ update-rc.d -f ssh remove >/dev/null
 # for password
 sed -i 's/requisite[ \t][ \t]*pam_securetty.so/required pam_securetty.so/' $rootfsdir/etc/pam.d/login
 
+# Install pamradius config (should come with radius client eventually)
+cp $sysconfdir/pam-radius /usr/share/pam-configs/radius
+
 [ grep "blacklist.*snd-pcsp" >&/dev/null ] || echo "blacklist snd-pcsp" >>/etc/modprobe.d/blacklist
 
 #