projects
/
mirror
/
dsa-wiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d6afa2b
)
Experiment with syntax
author
Peter Palfrader
<peter@palfrader.org>
Thu, 12 Mar 2009 18:52:59 +0000
(19:52 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Thu, 12 Mar 2009 18:52:59 +0000
(19:52 +0100)
input/howto/upgrade-to-lenny.mdwn
patch
|
blob
|
history
diff --git
a/input/howto/upgrade-to-lenny.mdwn
b/input/howto/upgrade-to-lenny.mdwn
index
31edee1
..
4ae58b9
100644
(file)
--- a/
input/howto/upgrade-to-lenny.mdwn
+++ b/
input/howto/upgrade-to-lenny.mdwn
@@
-150,9
+150,10
@@
rest follows
EOF
* merge changes into /etc/munin/plugin-conf.d/munin-node
+
(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)