apt-get dist-upgrade
-merge changes into /etc/pam.d/sudo
-(change old and reject (N))
-
- cat >> /etc/pam.d/sudo << EOF
-
- session required pam_permit.so
- session required pam_limits.so
- EOF
+reject changes to /etc/pam.d/sudo (puppet will install a new file later anyway)
merge changes into /etc/munin/plugin-conf.d/munin-node (change new and accept (A)):