diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 3 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 18 |
3 files changed, 15 insertions, 10 deletions
diff --git a/debian/control b/debian/control index 4b5692bb..20237cd1 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,9 @@ Depends: sed (>= 4.1.5), usbutils, tasksel, snmp, - tcpdump + tcpdump, + dnsmasq +Pre-Depends: bash-completion Suggests: util-linux (>= 2.13-5), net-tools, ethtool, 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 b21437a5..2c057103 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -7,7 +7,7 @@ bindir=@bindir@ sbindir=@sbindir@ # remove init of daemons that we start/stop -for init in ntp ssh snmpd openhpid vyatta-keepalived ipvsadm; do +for init in ntp ssh snmpd openhpid vyatta-keepalived ipvsadm dnsmasq; do update-rc.d -f ${init} remove >/dev/null done @@ -23,6 +23,7 @@ esac ln -sf ../vyatta-net.rules /etc/udev/rules.d/$vyatta_net_rules if [ "$sysconfdir" != "/etc" ]; then + touch /etc/sudoers cp -p /etc/sudoers /etc/sudoers.bak # for "admin" level @@ -32,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 @@ -85,6 +85,8 @@ if [ ! -f /etc/bash_completion ]; then echo "source /etc/bash_completion.d/20vyatta-cfg" >> /etc/bash_completion fi +sed -i 's/^set /builtin set /' /etc/bash_completion + # Local Variables: # mode: shell-script # sh-indentation: 4 |