diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-03-29 13:26:09 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-03-29 13:26:09 -0700 |
| commit | e454ea809bbabbc1259faea0d211b5f669e9bb4a (patch) | |
| tree | 3bfd5c64e79e57c8cded07e281182d25a738eb10 /debian | |
| parent | e8842469570de8af2fb8ee4d079743811b16565e (diff) | |
| parent | 4e0f41dd1c43468310b554866a81c92e84e98995 (diff) | |
| download | vyatta-cfg-quagga-e454ea809bbabbc1259faea0d211b5f669e9bb4a.tar.gz vyatta-cfg-quagga-e454ea809bbabbc1259faea0d211b5f669e9bb4a.zip | |
Merge branch 'glendale' into hollywood
Conflicts:
scripts/install-system
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/control b/debian/control index c332aabd..748ff063 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Depends: sed (>= 4.1.5), coreutils (>= 5.97-5.3), libpam-radius-auth, vyatta-cfg, - vyatta-bash, + vyatta-bash | bash (>= 3.1), sysv-rc, ntp, sysklogd, diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index f3d53450..30cbfd5a 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -43,7 +43,9 @@ Cmnd_Alias IPFLUSH = /sbin/ip route flush cache, \ /sbin/ip neigh flush dev * Cmnd_Alias ETHTOOLP = /usr/sbin/ethtool -p * Cmnd_Alias DATE = /bin/date, /usr/sbin/ntpdate -%operator ALL=NOPASSWD: /sbin/reboot, DATE, IPTABLES, ETHTOOLP, IPFLUSH +Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff +%operator ALL=NOPASSWD: /sbin/reboot, DATE, IPTABLES, ETHTOOLP, IPFLUSH, \ + PPPOE_CMDS EOF # for "users" level (FIXME) |