From c7e46403008ba169b262d24f90e12aaa30d98074 Mon Sep 17 00:00:00 2001
From: Rick Balocca <rbalocca@vyatta.com>
Date: Wed, 30 Jul 2008 12:19:45 -0700
Subject: Partial fix for http://bugzilla.vyatta.com/show_bug.cgi?id=3225

---
 debian/vyatta-cfg-system.postinst.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debian')

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 61a4842a..109e59d1 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -33,7 +33,7 @@ if [ "$sysconfdir" != "/etc" ]; then
     fi
 
     # cleanup any old entries from previous versions
-    ed - /etc/sudoers <<EOF
+    ed /etc/sudoers >&/dev/null <<EOF
 /### BEGIN VYATTA/,/### END VYATTA/d
 /Cmnd_Alias IPTABLE/,/PPPOE_CMDS/d
 g/sudo-users/d
-- 
cgit v1.2.3


From 3f03d4b94ff781aee561343a872a59ced68f0bf2 Mon Sep 17 00:00:00 2001
From: Rick Balocca <rbalocca@vyatta.com>
Date: Wed, 30 Jul 2008 12:39:23 -0700
Subject: Fix for http://bugzilla.vyatta.com/show_bug.cgi?id=3225

---
 debian/vyatta-cfg-system.postinst.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'debian')

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 109e59d1..0dd6248f 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -33,13 +33,12 @@ if [ "$sysconfdir" != "/etc" ]; then
     fi
 
     # cleanup any old entries from previous versions
-    ed /etc/sudoers >&/dev/null <<EOF
-/### BEGIN VYATTA/,/### END VYATTA/d
-/Cmnd_Alias IPTABLE/,/PPPOE_CMDS/d
-g/sudo-users/d
-g/env_keep+=VYATTA/d
-wq
-EOF
+    sed -i /etc/sudoers \
+	-e '/### BEGIN VYATTA/,/### END VYATTA/d' \
+	-e '/Cmnd_Alias IPTABLE/,/PPPOE_CMDS/d' \
+	-e '/sudo-users/d' \
+	-e '/env_keep+=VYATTA/d' || true
+
     # Add Vyatta entries
     cat <<"EOF" >>/etc/sudoers
 ### BEGIN VYATTA 
-- 
cgit v1.2.3


From 87365a0abddc24dd19b3c237fc04dd3d1417e936 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 30 Jul 2008 15:06:03 -0700
Subject: Get rid of debian build warning

Line too long
---
 debian/copyright | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'debian')

diff --git a/debian/copyright b/debian/copyright
index f12deb1f..5eb46c84 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,8 @@
 This package was debianized by An-Cheng Huang <ancheng@vyatta.com> on
 Thu, 18 Oct 2007 11:03:18 -0700.
 
-It's original content from the GIT repository <http://vyatt.com/git/vyatta-cfg-system>
+It's original content from the GIT repository 
+   <http://vyatt.com/git/vyatta-cfg-system>
 
 Upstream Author: 
 
-- 
cgit v1.2.3