2 Commits

Author SHA1 Message Date
Jay Larson
7793e4bc19 The following changes were made
* Removed non POSIX redirects
  * Removed setting of loopback up (seems to do this on its own?)
  * Corrected $verbose variable check (was -z, should be -n)
  * Added quotes for ip route command around $iface (colon was a problem)
  * Should note that v1.2 was incorrectly set in Makefile previously
2017-11-26 18:21:10 -06:00
Jay Larson
9730a62265 Corrected loopback device - will now set IP 2017-11-18 08:48:35 -06:00

View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
VERSION=1.0 VERSION=1.2
CONFDIR=/etc CONFDIR=/etc
CONFIGFILE=$CONFDIR/network.conf CONFIGFILE=$CONFDIR/network.conf
NL=' NL='
@@ -19,7 +19,9 @@ auto () {
fi fi
;; ;;
esac esac
done <<< "$1" done << EOF
$1
EOF
echo "$autoifaces" echo "$autoifaces"
} }
@@ -84,7 +86,9 @@ getinet () {
address=${address%% *} address=${address%% *}
;; ;;
esac esac
done <<< "$(ip addr show $iface)" done << EOF
$(ip addr show $iface)
EOF
echo $address echo $address
} }
@@ -218,7 +222,9 @@ up () {
;; ;;
esac esac
fi fi
done <<< "$2" done << EOF
$2
EOF
if [ -z "$exists" ]; then if [ -z "$exists" ]; then
echo "$iface not defined" echo "$iface not defined"
@@ -237,6 +243,21 @@ up () {
for brport in "$brports"; do for brport in "$brports"; do
[ -n "$verbose" ] && echo "Configuring $brport as slave to $iface" [ -n "$verbose" ] && echo "Configuring $brport as slave to $iface"
[ -n "$verbose" ] && echo "Flushing interface $brport"
if [ -n "$noact" ]; then
echo "ip address flush dev $brport"
else
ip address flush dev $brport
fi
[ -n "$verbose" ] && echo "Bringing up interface $brport"
if [ -n "$noact" ]; then
echo "ip link set dev $brport up"
else
ip link set dev $brport up
fi
if [ -n "$noact" ]; then if [ -n "$noact" ]; then
echo "ip link set dev $brport master $iface" echo "ip link set dev $brport master $iface"
@@ -336,7 +357,7 @@ up () {
fi fi
if [ -n "$gateway" ]; then if [ -n "$gateway" ]; then
[ -z "$verbose" ] && echo "Setting default route via $gateway" [ -n "$verbose" ] && echo "Setting default route via $gateway"
if [ -n "$noact" ]; then if [ -n "$noact" ]; then
echo "ip route add default via $gateway" echo "ip route add default via $gateway"
@@ -364,7 +385,7 @@ up () {
if [ -n "$noact" ]; then if [ -n "$noact" ]; then
echo "ip route add $route dev $iface src $address" echo "ip route add $route dev $iface src $address"
else else
ip route add $route dev $iface src $address ip route add $route dev "$iface" src "$address"
fi fi
done done
fi fi