summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jankowski <shasta@toxcorp.com>2017-11-21 02:50:50 +0100
committerRobby Workman <rworkman@slackware.com>2017-11-21 00:07:59 -0600
commit7cff32cd89f736d32405de05d73145e4e2dd1b70 (patch)
treee8f6132cc64f4e688c5070061564f4f95688798f
parent8b523392901a0ce13583eba09c29d7a1c4fafeba (diff)
downloadslacknetsetup-7cff32cd89f736d32405de05d73145e4e2dd1b70.tar.xz
rc.inet1: Add missing 'dev' keyword
Also, replace "ip addr" with "ip address" for consistency Signed-off-by: Robby Workman <rworkman@slackware.com>
-rw-r--r--rc.inet18
1 files changed, 4 insertions, 4 deletions
diff --git a/rc.inet1 b/rc.inet1
index a84299d..b29c285 100644
--- a/rc.inet1
+++ b/rc.inet1
@@ -96,12 +96,12 @@ br_open() {
# argument is 'i' - the position of this interface in the IFNAME array.
/sbin/ip link add name ${IFNAME[$1]} type bridge
for BRIF in ${BRNICS[$1]}; do
- /sbin/ip link set $BRIF down
+ /sbin/ip link set dev $BRIF down
/sbin/ip address add 0.0.0.0 dev $BRIF
/sbin/ip link set dev $BRIF master ${IFNAME[$1]}
- /sbin/ip link set $BRIF up
+ /sbin/ip link set dev $BRIF up
done
- /sbin/ip link set ${IFNAME[$1]} up
+ /sbin/ip link set dev ${IFNAME[$1]} up
}
# Function to disassemble a bridge interface.
@@ -144,7 +144,7 @@ if_up() {
fi
fi
if grep $(echo ${1}: | cut -f 1 -d :): /proc/net/dev 1> /dev/null ; then # interface exists
- if ! /sbin/ip addr show ${1} 2>/dev/null | grep -wq inet || \
+ if ! /sbin/ip address show dev ${1} 2>/dev/null | grep -wq inet || \
! /sbin/ip link show dev ${1} | grep -wq "state UP" ; then # interface not up or not configured
if [ -n "${HWADDR[$i]}" ]; then # Set hardware address _before_ the interface goes up:
echo "/etc/rc.d/rc.inet1: /sbin/ip link set dev ${1} address ${HWADDR[$i]}" | $LOGGER