summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-11-02 18:31:18 -0800
committerStig Thormodsrud <stig@vyatta.com>2009-11-02 18:31:18 -0800
commit1b9a722a77305bfc607a5a34317fbc743d2ae4bb (patch)
tree1a2dbccb40c30e6f151aeb6e139f62ad54e8c81a /debian
parenta6ead18568860f4a574325198ecfe188c69eda28 (diff)
parent4b6feb5e30012862b6a91578914ef2194d242f31 (diff)
downloadvyatta-cfg-quagga-1b9a722a77305bfc607a5a34317fbc743d2ae4bb.tar.gz
vyatta-cfg-quagga-1b9a722a77305bfc607a5a34317fbc743d2ae4bb.zip
Merge branch 'kenwood' of http://git.vyatta.com/vyatta-cfg-system into kenwood
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
-rw-r--r--debian/vyatta-cfg-system.postinst.in2
2 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c4c1a0aa..4d6c8583 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+vyatta-cfg-system (0.15.96) unstable; urgency=low
+
+ [ An-Cheng Huang ]
+ * use top-level pid for progress indicator
+
+ [ Stephen Hemminger ]
+ * Don't want/need --package option to pam-auth-update
+ * Reset PAM configuration on boot
+ * rename pam-radius to pam_radius.cfg
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com> Mon, 02 Nov 2009 17:28:17 -0800
+
vyatta-cfg-system (0.15.95) unstable; urgency=low
[ David S. Madole ]
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 95fcd1ca..3a914f7f 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -149,7 +149,7 @@ update-rc.d -f ssh remove >/dev/null
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
+cp $sysconfdir/pam_radius.cfg /usr/share/pam-configs/radius
[ grep "blacklist.*snd-pcsp" >&/dev/null ] || echo "blacklist snd-pcsp" >>/etc/modprobe.d/blacklist