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)