From 2f4d192f2fb01e8aae6915adb1f906e4c8f408f5 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 17 May 2010 20:05:32 +0000
Subject: [PATCH] [packages] ucarp: fix hardcoded paths to binaries (#7345)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@21496 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/ucarp/Makefile         |  2 +-
 net/ucarp/files/ucarp.init | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/net/ucarp/Makefile b/net/ucarp/Makefile
index 63051cb01..67afdfc30 100644
--- a/net/ucarp/Makefile
+++ b/net/ucarp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ucarp
 PKG_VERSION:=1.5.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.pureftpd.org/pub/ucarp
diff --git a/net/ucarp/files/ucarp.init b/net/ucarp/files/ucarp.init
index aa8ad9f70..c00baf4b6 100644
--- a/net/ucarp/files/ucarp.init
+++ b/net/ucarp/files/ucarp.init
@@ -2,6 +2,9 @@
 
 START=50
 CONF=/etc/ucarp.conf
+IP=$(which ip)
+UCARP=$(which ucarp)
+ARPING=$(which arping)
 
 start() {
 	. ${CONF}
@@ -11,13 +14,13 @@ start() {
 	cat > /var/run/ucarp-vip-up <<EOF
 #!/bin/sh
 
-/bin/ip addr add ${VIP}/${VMASK} dev ${IF}
+$IP addr add ${VIP}/${VMASK} dev ${IF}
 
 EOF
 	for ip in ${PINGIP}
 	do
 	cat >> /var/run/ucarp-vip-up <<EOF
-/usr/bin/arping -c 2 -I ${IF} -s ${VIP} ${ip}
+$ARPING -c 2 -I ${IF} -s ${VIP} ${ip}
 EOF
 	done
 	chmod a+x /var/run/ucarp-vip-up
@@ -25,12 +28,12 @@ EOF
 	cat > /var/run/ucarp-vip-down <<EOF
 #!/bin/sh
 
-/bin/ip addr del ${VIP}/${VMASK} dev ${IF}
+$IP addr del ${VIP}/${VMASK} dev ${IF}
 
 EOF
 	chmod a+x /var/run/ucarp-vip-down
 
-	/usr/sbin/ucarp --interface=${IF} --srcip=${MYIP} --vhid=1 --pass=${PASSWORD} \
+	$UCARP --interface=${IF} --srcip=${MYIP} --vhid=1 --pass=${PASSWORD} \
 			--addr=${VIP} --nomcast $daemon \
 			--upscript=/var/run/ucarp-vip-up --downscript=/var/run/ucarp-vip-down
 }