From: Evan Broder <broder@mit.edu>
Date: Wed, 26 Nov 2008 04:16:01 +0000 (-0500)
Subject: We don't need to remove the code from sudoers in the xvm-munin-config
X-Git-Tag: 0.0.5~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-munin-config.git/commitdiff_plain/a8cfb93c06c30653b497c6bce80f6f0b1261aee2

We don't need to remove the code from sudoers in the xvm-munin-config
postinst - the preinst will get run on upgrade

svn path=/trunk/packages/xvm-munin-config/; revision=1781
---

diff --git a/debian/changelog b/debian/changelog
index da21f63..56ccf75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ xvm-munin-config (0.0.5) unstable; urgency=low
 
   [ Evan Broder ]
   * Move the unnecessary Pre-Depends to a Depends
+  * We don't need to remove the code from sudoers in the postinst - the
+    preinst will get run on upgrade
 
- -- Evan Broder <broder@mit.edu>  Tue, 25 Nov 2008 23:13:36 -0500
+ -- Evan Broder <broder@mit.edu>  Tue, 25 Nov 2008 23:14:07 -0500
 
 xvm-munin-config (0.0.4) unstable; urgency=low
 
diff --git a/debian/xvm-munin-console-config.postinst b/debian/xvm-munin-console-config.postinst
index c992d7f..e19832a 100755
--- a/debian/xvm-munin-console-config.postinst
+++ b/debian/xvm-munin-console-config.postinst
@@ -23,9 +23,6 @@ case "$1" in
         # So munin can read the mail log
         adduser munin adm
         
-        # First clear out the old stuff we threw in /etc/sudoers
-        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
-        
         # So munin can sudo to get to postfix queue info
         cat >>/etc/sudoers <<EOF
 ### BEGIN xvm-munin-config
diff --git a/debian/xvm-munin-host-config.postinst b/debian/xvm-munin-host-config.postinst
index 3dbbeb6..f8e86d6 100755
--- a/debian/xvm-munin-host-config.postinst
+++ b/debian/xvm-munin-host-config.postinst
@@ -23,9 +23,6 @@ case "$1" in
         # So munin can read the mail log
         adduser munin adm
         
-        # First clear out the old stuff we threw in /etc/sudoers
-        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
-        
         # So munin can sudo to get to postfix queue info
         # and smartctl info
         # and info about running domains
diff --git a/debian/xvm-munin-master-config.postinst b/debian/xvm-munin-master-config.postinst
index 407cbef..721e584 100755
--- a/debian/xvm-munin-master-config.postinst
+++ b/debian/xvm-munin-master-config.postinst
@@ -23,9 +23,6 @@ case "$1" in
         # So munin can read the mail log
         adduser munin adm
         
-        # First clear out the old stuff we threw in /etc/sudoers
-        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
-        
         # So munin can sudo to get to postfix queue info
         cat >>/etc/sudoers <<EOF
 ### BEGIN xvm-munin-config
diff --git a/debian/xvm-munin-remote-config.postinst b/debian/xvm-munin-remote-config.postinst
index c992d7f..e19832a 100755
--- a/debian/xvm-munin-remote-config.postinst
+++ b/debian/xvm-munin-remote-config.postinst
@@ -23,9 +23,6 @@ case "$1" in
         # So munin can read the mail log
         adduser munin adm
         
-        # First clear out the old stuff we threw in /etc/sudoers
-        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
-        
         # So munin can sudo to get to postfix queue info
         cat >>/etc/sudoers <<EOF
 ### BEGIN xvm-munin-config