diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-02-29 22:55:45 +0000 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-02-29 22:55:45 +0000 |
| commit | d1fff3cab23fec182b70aba6589e475ec208d6e6 (patch) | |
| tree | 0510482681330b177ce209a4a4db043628e6b0ae /debian | |
| parent | 82b0bced0463c33ef48d8268072940a36ce04d68 (diff) | |
| parent | 90d8a2731ab6739abf3f8faae01dd16eea4c5ece (diff) | |
| download | vyatta-cfg-system-d1fff3cab23fec182b70aba6589e475ec208d6e6.tar.gz vyatta-cfg-system-d1fff3cab23fec182b70aba6589e475ec208d6e6.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into oxnard
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 30 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 3 |
2 files changed, 33 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 38537580..99e4567c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +vyatta-cfg-system (0.19.171) unstable; urgency=low + + * Cleanup interface statistic clear files on reboot + + -- Stephen Hemminger <shemminger@vyatta.com> Tue, 21 Feb 2012 21:22:56 -0800 + +vyatta-cfg-system (0.19.170) unstable; urgency=low + + * Fix server property option + + -- Stephen Hemminger <shemminger@vyatta.com> Tue, 21 Feb 2012 13:20:52 -0800 + +vyatta-cfg-system (0.19.169) unstable; urgency=low + + * Disable reboot on ctrl-alt-del + + -- Stephen Hemminger <shemminger@vyatta.com> Tue, 21 Feb 2012 12:23:28 -0800 + +vyatta-cfg-system (0.19.168) unstable; urgency=low + + * Remove reference to init-floppy + + -- Stephen Hemminger <shemminger@vyatta.com> Tue, 21 Feb 2012 11:09:38 -0800 + +vyatta-cfg-system (0.19.167) unstable; urgency=low + + * Fix spelling errors in install image + + -- Stephen Hemminger <shemminger@vyatta.com> Tue, 21 Feb 2012 10:56:55 -0800 + vyatta-cfg-system (0.19.166) unstable; urgency=low * Bug #7787: Allow using custom command line arguments in transition diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 2d028c8f..36644e7a 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -198,6 +198,9 @@ if [ -e /etc/default/mdadm ]; then sed -i 's/^START_DAEMON.*$/START_DAEMON=false/' /etc/default/mdadm fi +# Disable reboot on ctrl-alt-delete +sed -i -e '/^ca/s/\/sbin\/shutdown .*$/\/bin\/echo "Ctrl\-Alt\-Del disabled."/' /etc/inittab + # remove unnecessary ddclient script in /etc/ppp/ip-up.d/ # this logs unnecessary messages trying to start ddclient rm -f /etc/ppp/ip-up.d/ddclient |