summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorrbays <rbays@ft1.vyatta.com>2008-05-19 21:22:58 -0700
committerrbays <rbays@ft1.vyatta.com>2008-05-19 21:22:58 -0700
commit2b5d8a35ce7deda1829b60bbfac46e26f530b014 (patch)
tree61f322fc9250a00b3c471ef690376bbb06667bd1 /debian
parent1265e545b75857785f933465c104aff9ec91fbd3 (diff)
parent5b160a324927a457c8ddbd90afada3523b189a43 (diff)
downloadvyatta-cfg-system-2b5d8a35ce7deda1829b60bbfac46e26f530b014.tar.gz
vyatta-cfg-system-2b5d8a35ce7deda1829b60bbfac46e26f530b014.zip
Merge branch 'hollywood' of http://git.vyatta.com/vyatta-cfg-system into hollywood
Diffstat (limited to 'debian')
-rw-r--r--debian/control5
-rw-r--r--debian/vyatta-cfg-system.postinst.in2
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index ff40285f..1f63a6ce 100644
--- a/debian/control
+++ b/debian/control
@@ -22,11 +22,12 @@ Depends: sed (>= 4.1.5),
whois,
sudo,
snmpd,
- keepalived,
+ vyatta-keepalived | keepalived,
bridge-utils,
ssh,
ed,
- tshark
+ tshark,
+ iputils-arping
Suggests: util-linux (>= 2.13-5),
net-tools,
ethtool,
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index a627c4af..aa6f6310 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 keepalived ipvsadm; do
+for init in ntp ssh snmpd openhpid vyatta-keepalived ipvsadm; do
update-rc.d -f ${init} remove >/dev/null
done