diff options
| author | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-07-25 14:57:08 +0000 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-07-25 14:57:08 +0000 |
| commit | c4035aa5d0601eaa2a64d67ca70326f4de3873e8 (patch) | |
| tree | dfd5e96ba143d2d4bf1b8464c16bafa7c353fa91 /debian | |
| parent | 062638fb818c5632581f25f503684335b094be04 (diff) | |
| parent | 189dd8d9a5a467aea193aa5ce9e35c0ca14f7b91 (diff) | |
| download | vyatta-cfg-system-c4035aa5d0601eaa2a64d67ca70326f4de3873e8.tar.gz vyatta-cfg-system-c4035aa5d0601eaa2a64d67ca70326f4de3873e8.zip | |
Merge branch 'islavista' of mohit@git.vyatta.com:/git/vyatta-cfg-system into islavista
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/copyright | 3 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 13 |
2 files changed, 8 insertions, 8 deletions
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: diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 91e5f1e0..2c057103 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 <<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 |