fix for bug 2841. wanloadbalance is started on configuration, and on load of configuration (including boot

if configured).

4 files changed, 3 insertions, 6 deletions

diff --git a/Makefile.am b/Makefile.am
index 5987950..bad6cf3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = -I src -Wall -DDEBUG
 CLEANFILES = src/main.o src/lbdata.o src/lbdatafactory.o src/loadbalance.o src/rl_str_proc.o src/lbpathtest.o src/lboutput.o
 
 sbin_SCRIPTS = scripts/vyatta-wanloadbalance.pl
+sbin_SCRIPTS += scripts/vyatta-wanloadbalance.init
 
 src_wan_lb_SOURCES = src/main.cc
 src_wan_lb_SOURCES += src/lbdata.cc
diff --git a/debian/vyatta-wanloadbalance.postinst.in b/debian/vyatta-wanloadbalance.postinst.in
index 5f861cf..88182b8 100644
--- a/debian/vyatta-wanloadbalance.postinst.in
+++ b/debian/vyatta-wanloadbalance.postinst.in
@@ -4,15 +4,12 @@ LOADBALANCE_DIR=/var/load-balance
 
 
 prefix=/opt/vyatta
-sysconfdir=${prefix}/etc
 
 mkdir -p $LOADBALANCE_DIR
 chmod 0755 $LOADBALANCE_DIR
 
 touch ${LOADBALANCE_DIR}/wlb.conf
 
-update-rc.d -f vyatta-wanloadbalance defaults 2>/dev/null
-
 #now move op cmds to correct location
 rm -fr /opt/vyatta/share/vyatta-op/templates/show/wan-load-balance/*
 mv /opt/vyatta/share/vyatta-cfg/templates/show/wan-load-balance /opt/vyatta/share/vyatta-op/templates/show/. 2>/dev/null
\ No newline at end of file
diff --git a/debian/vyatta-wanloadbalance.postrm.in b/debian/vyatta-wanloadbalance.postrm.in
index b4835a3..b594ebe 100644
--- a/debian/vyatta-wanloadbalance.postrm.in
+++ b/debian/vyatta-wanloadbalance.postrm.in
@@ -1,5 +1,4 @@
 #!/bin/bash
-which /etc/init.d/vyatta-wanloadbalance >/dev/null && /etc/init.d/vyatta-wanloadbalance stop
+which /opt/vyatta/sbin/vyatta-wanloadbalance >/dev/null && /opt/vyatta/sbin/vyatta-wanloadbalance stop
 
-update-rc.d -f vyatta-wanloadbalance remove
 
diff --git a/scripts/vyatta-wanloadbalance.pl b/scripts/vyatta-wanloadbalance.pl
index 17371ca..7a27c27 100644
--- a/scripts/vyatta-wanloadbalance.pl
+++ b/scripts/vyatta-wanloadbalance.pl
@@ -178,6 +178,6 @@ unlink($conf_lck_file);
 
 
 #finally kick the process
-system "/etc/init.d/vyatta-wanloadbalance restart $conf_file";
+system "/opt/vyatta/sbin/vyatta-wanloadbalance.init restart $conf_file";
 
 exit 0;