diff options
| author | Michael Larson <slioch@eng-140.vyatta.com> | 2008-02-11 16:14:07 -0800 |
|---|---|---|
| committer | Michael Larson <slioch@eng-140.vyatta.com> | 2008-02-11 16:14:07 -0800 |
| commit | c176c2df0879e2339fdcc430edae55111f97842b (patch) | |
| tree | 1bf9ff66c4d137d744b5558fe79d6dcc382b9be8 | |
| parent | b71a8e2a8aad1cebd9f05f002f25f16f19b0620b (diff) | |
| parent | f5997468a4aad5000cde8563ed277edbaf11d70f (diff) | |
| download | vyatta-wanloadbalance-c176c2df0879e2339fdcc430edae55111f97842b.tar.gz vyatta-wanloadbalance-c176c2df0879e2339fdcc430edae55111f97842b.zip | |
Merge branch 'master' into glendale
Conflicts:
debian/vyatta-wanloadbalance.postinst
debian/vyatta-wanloadbalance.postrm
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | debian/vyatta-wanloadbalance.postinst.in | 7 | ||||
| -rw-r--r-- | debian/vyatta-wanloadbalance.postrm.in | 3 | ||||
| -rw-r--r-- | etc/init.d/vyatta-wanloadbalance | 31 |
5 files changed, 42 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 864c0ad..5987950 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,13 @@ cfgdir = $(datadir)/vyatta-cfg/templates initddir = /etc/init.d +etcdir = /etc 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.init -sbin_SCRIPTS += scripts/vyatta-wanloadbalance.pl +sbin_SCRIPTS = scripts/vyatta-wanloadbalance.pl src_wan_lb_SOURCES = src/main.cc src_wan_lb_SOURCES += src/lbdata.cc @@ -26,3 +26,4 @@ cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ install-exec-hook: mkdir -p $(DESTDIR)$(cfgdir) cd templates; $(cpiop) $(DESTDIR)$(cfgdir) + find etc ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | cpio -0pd $(DESTDIR)
\ No newline at end of file diff --git a/configure.ac b/configure.ac index ab2bacf..38b00d0 100644 --- a/configure.ac +++ b/configure.ac @@ -28,8 +28,7 @@ AC_ARG_ENABLE([nostrip], AC_CONFIG_FILES( [Makefile] [debian/vyatta-wanloadbalance.postinst] - [debian/vyatta-wanloadbalance.postrm] - [scripts/vyatta-wanloadbalance.init]) + [debian/vyatta-wanloadbalance.postrm]) AC_SUBST(NOSTRIP) diff --git a/debian/vyatta-wanloadbalance.postinst.in b/debian/vyatta-wanloadbalance.postinst.in index dea57dc..0a900f6 100644 --- a/debian/vyatta-wanloadbalance.postinst.in +++ b/debian/vyatta-wanloadbalance.postinst.in @@ -3,10 +3,11 @@ LOADBALANCE_DIR=/var/load-balance -prefix=@prefix@ -sysconfdir=@sysconfdir@ +prefix=/opt/vyatta +sysconfdir=${prefix}/etc mkdir -p $LOADBALANCE_DIR chmod 0755 $LOADBALANCE_DIR -#nothing +update-rc.d -f vyatta-wanloadbalance defaults 2>/dev/null + diff --git a/debian/vyatta-wanloadbalance.postrm.in b/debian/vyatta-wanloadbalance.postrm.in index 05a7907..c9bc1e8 100644 --- a/debian/vyatta-wanloadbalance.postrm.in +++ b/debian/vyatta-wanloadbalance.postrm.in @@ -1,2 +1,5 @@ #!/bin/bash +which /etc/init.d/vyatta-wanloadbalance >/dev/null && /etc/init.d/vyatta-wanloadbalance stop + +update-rc.d vyatta-wanloadbalance remove diff --git a/etc/init.d/vyatta-wanloadbalance b/etc/init.d/vyatta-wanloadbalance new file mode 100644 index 0000000..fb5edcc --- /dev/null +++ b/etc/init.d/vyatta-wanloadbalance @@ -0,0 +1,31 @@ +#! /bin/bash + +declare progname=${0##*/} +declare action=$1; shift + +conf=$1; shift +pid=/var/run/vyatta/wlb.pid + +test -x $bb || exit 0 + +start () +{ + /opt/vyatta/sbin/wan_lb -f $conf -d -i $pid +} + +stop () +{ + if [ -f $pid ] + then + kill -s SIGTERM $( cat $pid ) 2>/dev/null + fi +} + +case "$action" in + start) start;; + stop) stop;; + force-reload) stop; sleep 1; start;; + restart) stop; sleep 1; start;; + *) echo "Usage: $progname {start|stop|restart}" + exit 1 +esac |