2 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
4 changed files with 21 additions and 15 deletions

View File

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

View File

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

View File

@@ -2,7 +2,8 @@ dirs:
install -d -v -m 755 $(DESTDIR)/etc/init.d install -d -v -m 755 $(DESTDIR)/etc/init.d
install -d -v -m 755 $(DESTDIR)/etc/network.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/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 install -d -v -m 755 $(DESTDIR)/sbin
files: files:

View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
VERSION=1.1 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"
@@ -306,10 +312,8 @@ up () {
if [ -n "$noact" ]; then if [ -n "$noact" ]; then
echo "ip link set dev $iface up" echo "ip link set dev $iface up"
echo "ip addr add 127.0.0.1/8 dev $iface"
else else
ip link set dev $iface up ip link set dev $iface up
ip addr add 127.0.0.1/8 dev $iface
fi fi
elif [ -n "$static" ]; then elif [ -n "$static" ]; then
case "$iface" in case "$iface" in
@@ -353,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"
@@ -381,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