3 Commits

Author SHA1 Message Date
Jay Larson
508121866c The following changes were made:
* Added dash as dependency
  * Added URL
  * Added REPO
  * Moved usher from bash to /bin/sh
  * Removed TARGET from usher
  * Tweaked SRC Makefile to work with /bin/sh
2018-03-27 09:17:00 -05:00
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
4 changed files with 36 additions and 13 deletions

View File

@@ -8,13 +8,14 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
DEPENDS = dhclient,iproute2
DEPENDS = dash,dhclient,iproute2
ARCH = none
URL =
URL = http://snaplinux.org/
REPO = core
BRIEF = Scripts for starting and stopping network interfaces
DESC = Scripts which use the iproute2 tools for automatically starting and \
stopping network devices during startup.
SNAPVER = 0
SNAPVER = 1
ARCHIVE :=
SRCDIR := $(PWD)/SRC/iftools

View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
set -e
@@ -7,8 +7,8 @@ case $1 in
exit 0
;;
postinst)
if [ ! -f ${TARGET}/etc/network.conf ]; then
cp ${TARGET}/usr/share/iftools/network.conf ${TARGET}/etc/network.conf
if [ ! -f /etc/network.conf ]; then
cp /usr/share/iftools/network.conf /etc/network.conf
fi
;;
prerm)

View File

@@ -2,7 +2,8 @@ dirs:
install -d -v -m 755 $(DESTDIR)/etc/init.d
install -d -v -m 755 $(DESTDIR)/etc/network.d
install -d -v -m 755 $(DESTDIR)/usr/share/iftools
install -d -v -m 755 $(DESTDIR)/usr/share/man/man{5,8}
install -d -v -m 755 $(DESTDIR)/usr/share/man/man5
install -d -v -m 755 $(DESTDIR)/usr/share/man/man8
install -d -v -m 755 $(DESTDIR)/sbin
files:

View File

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