diff options
| author | Martin Schwenke <martin@meltin.net> | 2011-06-28 15:17:37 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2011-08-08 15:50:10 +1000 |
| commit | 50dc5b01a4bf92226c2024e60b3fe91ecbffa8db (patch) | |
| tree | 76875ae22875e93976974db1602ad248f39174ba | |
| parent | eec654314aaa590e2a4b7d94e01a4e009a2d4683 (diff) | |
| download | samba-50dc5b01a4bf92226c2024e60b3fe91ecbffa8db.tar.gz samba-50dc5b01a4bf92226c2024e60b3fe91ecbffa8db.tar.xz samba-50dc5b01a4bf92226c2024e60b3fe91ecbffa8db.zip | |
Scripts: remove absolute paths from interface_modify.sh.
The "ip" command is currently run as "/sbin/ip". This makes it
impossible to replace with a stub in unit testing. The functions file
controls $PATH, so we don't need absolute paths.
This replaces the absolute paths...
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 5b4c712aab3edc0059f2e5a6730b7fdcf7e5f4ec)
| -rwxr-xr-x | ctdb/config/interface_modify.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ctdb/config/interface_modify.sh b/ctdb/config/interface_modify.sh index 27e06ea673..041637650f 100755 --- a/ctdb/config/interface_modify.sh +++ b/ctdb/config/interface_modify.sh @@ -17,11 +17,11 @@ add_ip_to_iface() local _script_dir="$_readd_base/$_ip.$_maskbits" # we make sure the interface is up first - /sbin/ip link set $_iface up || { + ip link set $_iface up || { echo "Failed to bringup interface $_iface" return 1; } - /sbin/ip addr add $_ip/$_maskbits brd + dev $_iface || { + ip addr add $_ip/$_maskbits brd + dev $_iface || { echo "Failed to add $_ip/$_maskbits on dev $_iface" return 1; } @@ -48,19 +48,19 @@ delete_ip_from_iface() # this _very_ annoying behaviour we have to keep a record of the secondaries and re-add # them afterwards. yuck local _secondaries="" - if /sbin/ip addr list dev $_iface primary | grep -q "inet $_ip/$_maskbits " ; then - _secondaries=`/sbin/ip addr list dev $_iface secondary | grep " inet " | awk '{print $2}'` + if ip addr list dev $_iface primary | grep -q "inet $_ip/$_maskbits " ; then + _secondaries=`ip addr list dev $_iface secondary | grep " inet " | awk '{print $2}'` fi local _failed=0 - /sbin/ip addr del $_ip/$_maskbits dev $_iface || _failed=1 + ip addr del $_ip/$_maskbits dev $_iface || _failed=1 [ -z "$_secondaries" ] || { local _i="" for _i in $_secondaries; do - if /sbin/ip addr list dev $_iface | grep -q "inet $_i" ; then + if ip addr list dev $_iface | grep -q "inet $_i" ; then echo "kept secondary $_i on dev $_iface" else echo "re-adding secondary address $_i to dev $_iface" - /sbin/ip addr add $_i brd + dev $_iface || _failed=1 + ip addr add $_i brd + dev $_iface || _failed=1 fi local _s_ip=`echo "$_i" | cut -d '/' -f1` local _s_maskbits=`echo "$_i" | cut -d '/' -f2` |