From: Peter Palfrader Date: Thu, 12 Mar 2009 18:53:44 +0000 (+0100) Subject: Experiment with syntax X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=835a56c8af5f7a739bf685c4fbf19879df34f15b;p=mirror%2Fdsa-wiki.git Experiment with syntax --- diff --git a/input/howto/upgrade-to-lenny.mdwn b/input/howto/upgrade-to-lenny.mdwn index 4ae58b9..c0ba8e1 100644 --- a/input/howto/upgrade-to-lenny.mdwn +++ b/input/howto/upgrade-to-lenny.mdwn @@ -140,20 +140,18 @@ rest follows apt-get dist-upgrade -* merge changes into /etc/pam.d/sudo +merge changes into /etc/pam.d/sudo +(change old and reject (N)) - (change old and reject (N)) cat >> /etc/pam.d/sudo << EOF session required pam_permit.so session required pam_limits.so EOF -* merge changes into /etc/munin/plugin-conf.d/munin-node +merge changes into /etc/munin/plugin-conf.d/munin-node (change new and accept (A)): - (change new and accept (A)): - - sed -i -e 's/adm$/adm, maillog/' /etc/munin/plugin-conf.d/munin-node.dpkg-new + sed -i -e 's/adm$/adm, maillog/' /etc/munin/plugin-conf.d/munin-node.dpkg-new * keep local (i.e. reject (N)): * all changes relating to exim (in /etc/exim4 and in logrotate)