Merge ~mkukri/ubuntu/+source/ifupdown:merge into ubuntu/+source/ifupdown:ubuntu/devel

[Mate Kukri]

Merge ifupdown with Debian Sid.

PPA testbuild: https://launchpad.net/~mkukri/+archive/ubuntu/dev/+build/27771026
PPA autopkgtest: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mkukri-dev/noble/amd64/i/ifupdown/20240214_155505_b8eed@/log.gz

Unmerged commits

eab972a... by Mate Kukri on 2024-02-14

changelog

821e2c1... by Mate Kukri on 2024-02-14

update-maintainer

2996209... by Mate Kukri on 2024-02-14

reconstruct-changelog

1ce7d8f... by Mate Kukri on 2024-02-14

merge-changelogs

fff3a64... by Mate Kukri on 2024-02-14

  * Fix if-up.d/resolved hook to properly work with nameservers and search
    domains (LP: #1981103)

e4c845a... by Mate Kukri on 2024-02-14

- ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
  don't really support "allow-hotplug" in Ubuntu at the moment, so we need
  to deal with "auto" devices appearing after the "networking" init script
  already ran.

0102833... by Mate Kukri on 2024-02-14

- Always call dhclient with -1, Ubuntu carries a patch so that renewal
  won't time out.

f612bcf... by Santiago Ruano Rincon on 2023-01-24

0.8.41 (patches unapplied)

Imported using git-ubuntu import.

aa37842... by Santiago Ruano Rincon on 2023-01-16

0.8.40 (patches unapplied)

Imported using git-ubuntu import.

ced6b41... by Santiago Ruano Rincon on 2022-10-04

0.8.39 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/archcommon.c b/archcommon.c
index 52a2666..32c541f 100644
--- a/archcommon.c
+++ b/archcommon.c
@@ -23,7 +23,7 @@ bool _iface_has(const char *iface, const char *delims) {
 	return (token != NULL);
 }
 
-bool execable(const char *program) {
+static bool file_is_exec(const char *program) {
 	struct stat buf;
 
 	if (0 == stat(program, &buf))
@@ -33,6 +33,52 @@ bool execable(const char *program) {
 	return false;
 }
 
+bool execable(const char *program) {
+	char *filename = NULL;
+	const char *path_list;
+	const char *path, *path_end;
+	size_t path_len;
+
+	if (program[0] == '/')
+		return file_is_exec(program);
+
+	path_list = getenv("PATH");
+	if (!path_list)
+		return false;
+
+	/*
+	 * We allocate based on the length of PATH and the program name we
+	 * are looking for (plus one byte for the terminating NUL, and a
+	 * potential "/"), as we take PATH apart into pieces and thus the
+	 * resulting length cannot be greater than that. This avoids having
+	 * to realloc() within the loop.
+	 */
+	filename = malloc(strlen(path_list) + strlen(program) + 2);
+	if (!filename)
+		err(1, "malloc");
+
+	for (path = path_list; path; path = path_end ? path_end + 1 : NULL) {
+		path_end = strchr(path, ':');
+		path_len = path_end ? (size_t)(path_end - path) : strlen(path);
+
+		filename[0] = '\0';
+		strncat(filename, path, path_len);
+		if (path_len)
+			strcat(filename + path_len, "/");
+		/* Append at the end regardless of whether we have added a
+		 * trailing "/". */
+		strcat(filename + path_len, program);
+
+		if (file_is_exec(filename)) {
+			free(filename);
+			return true;
+		}
+	}
+
+	free(filename);
+	return false;
+}
+
 void cleanup_hwaddress(interface_defn *ifd, char **pparam, int argc, char **argv) {
 	/* replace "random" with a random MAC address */
 	if (strcmp(*pparam, "random") == 0) {
diff --git a/archcommon.h b/archcommon.h
index fe99950..818b0b6 100644
--- a/archcommon.h
+++ b/archcommon.h
@@ -5,6 +5,7 @@ bool execable(const char *);
 #define iface_is_link() (!_iface_has(ifd->real_iface, ":."))
 #define iface_has(s) _iface_has(ifd->real_iface, (s))
 #define iface_is_lo() ((!strcmp(ifd->logical_iface, LO_IFACE)) && (!no_loopback))
+#define var_strcasecmp(name, value) (strcasecmp(value, get_var(name, strlen(name), ifd)))
 
 bool _iface_has(const char *, const char *);
 void cleanup_hwaddress(interface_defn *ifd, char **pparam, int argc, char **argv);
diff --git a/can.defn b/can.defn
index 65e79e6..c246f07 100644
--- a/can.defn
+++ b/can.defn
@@ -13,7 +13,8 @@ method static
     listenonly listenonly	-- listen only mode (on|off)
     triple triple		-- activate triple sampling (on|off)
     oneshot oneshot		-- one shot mode (on|off)
-    berr berr			-- activate berr reporting (on|off) 
+    berr berr			-- activate berr reporting (on|off)
+    restart-ms restart-ms	-- restart-ms (0..)
 
   up
     ip link set %iface% type can bitrate %bitrate%
@@ -22,6 +23,7 @@ method static
     [[ ip link set %iface% type can triple-sampling %triple% ]]
     [[ ip link set %iface% type can one-shot %oneshot% ]]
     [[ ip link set %iface% type can berr-reporting %berr% ]]
+    [[ ip link set %iface% type can restart-ms %restart-ms% ]]
     ip link set %iface% up
 
   down
diff --git a/debian/changelog b/debian/changelog
index 6c83251..c017763 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,98 @@
+<<<<<<< debian/changelog
+=======
+ifupdown (0.8.41ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Always call dhclient with -1, Ubuntu carries a patch so that renewal
+      won't time out.
+    - ifup@.service, ifupdown-hotplug: Additionally run for "auto" class. We
+      don't really support "allow-hotplug" in Ubuntu at the moment, so we need
+      to deal with "auto" devices appearing after the "networking" init script
+      already ran.
+    - Fix if-up.d/resolved hook to properly work with nameservers and search
+      domains (LP: 1981103)
+  * Changes now included in Debian:
+    - Ship resolved integration scripts.
+
+ -- Mate Kukri <[e-mail]>  Wed, 14 Feb 2024 14:14:08 +0000
+
+ifupdown (0.8.41) unstable; urgency=high
+
+  * networking.service: Improve how to handle hotplug devices. Thanks to kibi,
+    Oleg A. Arkhangelsky <[e-mail]>, et al.
+    (Closes: #1022843, #1029449)
+  * d/tests/hotplug: add more tests, including unplugged dummy interface
+
+ -- Santiago Ruano Rincón <[e-mail]>  Tue, 24 Jan 2023 14:07:32 +0100
+
+ifupdown (0.8.40) unstable; urgency=medium
+
+  [ Colin Watson ]
+  * Clarify formatting of post-up and pre-down aliases in interfaces(5).
+
+  [ Vincent Bernat ]
+  * Kill dhclient on down for inet6 auto method. (Closes: #1000180)
+
+  [ Santiago Ruano Rincón ]
+  * networking.service: Wants ifupdown-pre.service instead of Requiring it.
+    Patch by Ron <[e-mail]>
+    (Closes: #998088)
+  * networking.service: Add ExecStart=/sbin/ifup -a --allow=hotplug. Patch by
+    "Oleg A. Arkhangelsky" <[e-mail]>
+    (Closes: #1022843)
+  * Update d/copyright and fix Source URL
+
+  [ Marek Vasut ]
+  * Add short -f option for --force long option
+
+  [ Simon Arlott ]
+  * Support IPv6 tunnels (ip6ip6 and ip6gre)
+  * Support encaplimit on IPv6 tunnels
+  * Document and test support for ipip6 tunnels too (IPv4 in IPv6)
+
+  [ Guillem Jover ]
+  * Rework execable() function to accept a filename instead of a pathname
+  * Do not use absolute pathnames when executing commands
+
+ -- Santiago Ruano Rincón <[e-mail]>  Mon, 16 Jan 2023 14:57:59 +0100
+
+ifupdown (0.8.39) unstable; urgency=low
+
+  * Add execution permission on resolved scripts. Thanks to Vincent Lefèvre
+    (Closes: #1021259)
+
+ -- Santiago Ruano Rincón <[e-mail]>  Tue, 04 Oct 2022 17:24:23 +0200
+
+ifupdown (0.8.38) unstable; urgency=low
+
+  [ Johannes Schauer Marin Rodrigues ]
+  * Remove dependency on lsb-base (Closes: #1020604)
+
+  [ Santiago Ruano Rincón ]
+  * Remove pump support (no longer in Debian archive)
+  * Fix error message when turning down VLAN interfaces. Thanks to Aleksandr
+    Muravjov (Closes: #1007889)
+  * Ship Ubuntu's integration scripts for systemd-resolved. Thanks to Luca
+    Boccassi (Closes: #1016798)
+  * Add rfkill support. Thanks to Sebastian Reichel <[e-mail]>
+    (Closes: #645559)
+
+ -- Santiago Ruano Rincón <[e-mail]>  Mon, 03 Oct 2022 16:24:38 +0200
+
+ifupdown (0.8.37) unstable; urgency=low
+
+  * Add debian/gbp.conf
+  * Acknowledge 0.8.36+nmu1.
+  * Add timeout for IPv6 stateless dhcp. Thanks to Joerg Dorchain <[e-mail]>
+    (Closes: #947234)
+  * Correctly copy (duplicate) the interface to exclude with --read-environment. Thanks to Adam Stephens <[e-mail]>
+    (Closes: #994745)
+  * Include restart-ms option in can config. Thanks to Joerg Dorchain <[e-mail]>
+    (Closes: #947233)
+
+ -- Santiago Ruano Rincón <[e-mail]>  Wed, 19 Jan 2022 20:55:17 +0100
+
+>>>>>>> debian/changelog
 ifupdown (0.8.36+nmu1ubuntu5) mantic; urgency=medium
 
   [ Uwe Kleine-König ]
diff --git a/debian/control b/debian/control
index c16a114..d674cd3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: important
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Josué Ortega <[e-mail]>
 Uploaders: Santiago Ruano Rincón <[e-mail]>
-Standards-Version: 4.5.0
+Standards-Version: 4.6.1
 Build-Depends: debhelper-compat (= 13)
 Vcs-Git: https://salsa.debian.org/debian/ifupdown.git
 Vcs-Browser: https://salsa.debian.org/debian/ifupdown
@@ -13,7 +13,7 @@ Rules-Requires-Root: no
 Package: ifupdown
 Architecture: any
 Depends: ${net:Depends}, ${shlibs:Depends}, ${misc:Depends},
- lsb-base, adduser,
+ adduser,
  iproute2 [linux-any], freebsd-net-tools [kfreebsd-any], inetutils-tools [hurd-any]
 Recommends: isc-dhcp-client | dhcp-client
 Suggests: ppp, rdnssd, ${net:Suggests}
diff --git a/debian/copyright b/debian/copyright
index c3348a4..3b9b419 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,12 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ifupdown
-Source: https://anonscm.debian.org/cgit/collab-maint/ifupdown.git
+Source: https://salsa.debian.org/debian/ifupdown/
 
 Files: *
 Copyright: 1999-2009 Anthony Towns
            2010-2015 Andrew Shadura
-	   2015      Guus Sliepen
+           2015      Guus Sliepen
+           2020-2022 Josué Ortega, Santiago Ruano Rincón
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..1f5a11d
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-tag = %(version)s
diff --git a/debian/ifupdown-hotplug b/debian/ifupdown-hotplug
index effdec9..a1e39a7 100755
--- a/debian/ifupdown-hotplug
+++ b/debian/ifupdown-hotplug
@@ -5,10 +5,8 @@
 
 PATH='/sbin:/bin:/usr/sbin:/usr/bin'
 
-if [ -x /usr/bin/logger ]; then
-	LOGGER=/usr/bin/logger
-elif [ -x /bin/logger ]; then
-	LOGGER=/bin/logger
+if [ -x "$(command -v logger)" ]; then
+	LOGGER=logger
 else
 	unset LOGGER
 fi
@@ -35,7 +33,7 @@ if [ -z "$INTERFACE" ]; then
 fi
 
 check_program() {
-    [ -x $1 ] && return 0
+    [ -x "$(command -v $1)" ] && return 0
 
     mesg "ERROR: $1 not found. You need to install the ifupdown package."
     mesg "ifupdown udev helper $ACTION event for $INTERFACE not handled."
@@ -56,10 +54,13 @@ wait_for_interface() {
 }
 
 net_ifup() {
-    check_program /sbin/ifup
+    check_program ifup
 
     # exit if the interface is not configured as allow-hotplug
-    TARGET_IFACE=$(/sbin/ifquery --allow hotplug -l "$INTERFACE" || true)
+    TARGET_IFACE=$(ifquery --allow hotplug -l "$INTERFACE" || true)
+    if [ -z "$TARGET_IFACE" ]; then
+        TARGET_IFACE=$(/sbin/ifquery --allow auto -l "$INTERFACE" || true)
+    fi
     if [ -z "$TARGET_IFACE" ]; then
         TARGET_IFACE=$(/sbin/ifquery --allow auto -l "$INTERFACE" || true)
     fi
@@ -77,7 +78,7 @@ net_ifup() {
 }
 
 net_ifdown() {
-    check_program /sbin/ifdown
+    check_program ifdown
 
     # systemd will automatically ifdown the interface on device
     # removal by binding the instanced service to the network device
diff --git a/debian/ifupdown-rfkill b/debian/ifupdown-rfkill
new file mode 100755
index 0000000..89c91c1
--- /dev/null
+++ b/debian/ifupdown-rfkill
@@ -0,0 +1,23 @@
+#!/bin/sh
+CHANGE=$3
+SYSFS=$1
+DEVICE=$SYSFS$2
+
+PATH='/sbin:/bin:/usr/sbin:/usr/bin'
+
+if [ -e $DEVICE ] ; then
+	while [ $DEVICE != $SYSFS ] ; do
+		DEVICE=`dirname $DEVICE`
+
+		if [ -d $DEVICE/net ] ; then
+			for INTERFACE in $DEVICE/net/* ; do
+				INTERFACE=`basename $INTERFACE`
+				
+				case $CHANGE in
+					"1")     ifup   --allow=rfkill $INTERFACE ;;
+					"0"|"2") ifdown --allow=rfkill $INTERFACE ;;
+				esac
+			done
+		fi
+	done
+fi
diff --git a/debian/ifupdown-rfkill.rules b/debian/ifupdown-rfkill.rules
new file mode 100644
index 0000000..73c93d0
--- /dev/null
+++ b/debian/ifupdown-rfkill.rules
@@ -0,0 +1,3 @@
+# run ifupdown for each wlan rfkill change
+ACTION=="change", ENV{RFKILL_TYPE}=="wlan", SUBSYSTEM=="rfkill", \
+RUN+="/usr/local/sbin/ifupdown-rfkill %S %p $env{RFKILL_STATE}"
diff --git a/debian/ifupdown.maintscript b/debian/ifupdown.maintscript
index 2203f84..4c2a73d 100644
--- a/debian/ifupdown.maintscript
+++ b/debian/ifupdown.maintscript
@@ -1,9 +1,2 @@
-rm_conffile /etc/default/ifupdown 0.7~+ ifupdown
-rm_conffile /etc/init.d/ifupdown 0.7~+ ifupdown
-rm_conffile /etc/init.d/ifupdown-clean 0.7~beta1 ifupdown
-rm_conffile /etc/init/networking.conf 0.8.25~ ifupdown
-rm_conffile /etc/init/network-interface-container.conf 0.8.25~ ifupdown
-rm_conffile /etc/init/network-interface-security.conf 0.8.25~ ifupdown
-rm_conffile /etc/init/network-interface.conf 0.8.25~ ifupdown
 rm_conffile /etc/network/if-up.d/upstart 0.8.29~ ifupdown
 rm_conffile /etc/network/if-down.d/upstart 0.8.29~ ifupdown
diff --git a/debian/networking.init b/debian/networking.init
index a4cc342..1a366ed 100644
--- a/debian/networking.init
+++ b/debian/networking.init
@@ -9,13 +9,13 @@
 # Description:       Prepare /run/network directory, ifstate file and raise network interfaces, or take them down.
 ### END INIT INFO
 
-PATH="/sbin:/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin"
 RUN_DIR="/run/network"
 IFSTATE="$RUN_DIR/ifstate"
 STATEDIR="$RUN_DIR/state"
 
-[ -x /sbin/ifup ] || exit 0
-[ -x /sbin/ifdown ] || exit 0
+[ -x "$(command -v ifup)" ] || exit 0
+[ -x "$(command -v ifdown)" ] || exit 0
 
 . /lib/lsb/init-functions
 
@@ -130,9 +130,9 @@ start)
 	set -f
 	exclusions=$(process_exclusions)
 	log_action_begin_msg "Configuring network interfaces"
-	if [ -x /bin/udevadm ]; then
+	if [ -x "$(command -v udevadm)" ]; then
 		if [ -n "$(ifquery --list --exclude=lo)" ] || [ -n "$(ifquery --list --allow=hotplug)" ]; then
-			/bin/udevadm settle || true
+			udevadm settle || true
 		fi
 	fi
 	if ifup -a $exclusions $verbose && ifup_hotplug $exclusions $verbose
diff --git a/debian/networking.service b/debian/networking.service
index 593172b..cc403d8 100644
--- a/debian/networking.service
+++ b/debian/networking.service
@@ -2,8 +2,7 @@
 Description=Raise network interfaces
 Documentation=man:interfaces(5)
 DefaultDependencies=no
-Requires=ifupdown-pre.service
-Wants=network.target
+Wants=network.target ifupdown-pre.service
 After=local-fs.target network-pre.target apparmor.service systemd-sysctl.service systemd-modules-load.service ifupdown-pre.service
 Before=network.target shutdown.target network-online.target
 Conflicts=shutdown.target
@@ -16,6 +15,8 @@ WantedBy=network-online.target
 Type=oneshot
 EnvironmentFile=-/etc/default/networking
 ExecStart=/sbin/ifup -a --read-environment
+ExecStart=-/bin/sh -c 'if [ -f /run/network/restart-hotplug ]; then /sbin/ifup -a --read-environment --allow=hotplug; fi'
 ExecStop=/sbin/ifdown -a --read-environment --exclude=lo
+ExecStopPost=/usr/bin/touch /run/network/restart-hotplug
 RemainAfterExit=true
 TimeoutStartSec=5min
diff --git a/debian/tests/control b/debian/tests/control
index 7b3f584..bfeeb75 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: hotplug
 Depends: ifupdown
 # requires udev, thus does not work in containers
-Restrictions: needs-root, isolation-machine
+Restrictions: needs-root, isolation-machine, needs-reboot
 
diff --git a/debian/tests/hotplug b/debian/tests/hotplug
index 93993fb..469f0f0 100755
--- a/debian/tests/hotplug
+++ b/debian/tests/hotplug
@@ -2,30 +2,46 @@
 # check behaviour of "allow-hotplug" interface
 set -e
 
+date -R
+
 IFACE=sdtest42
+IFACE_DUMMY=ethdummy0
 
-if [ -e /sys/class/net/$IFACE ]; then
-    echo "SKIP: network interface $IFACE already exists"
-    exit 0
+if [ -z "$AUTOPKGTEST_REBOOT_MARK" ]; then
+    if [ -e /sys/class/net/$IFACE ]; then
+        echo "SKIP: network interface $IFACE already exists"
+        exit 0
+    fi
 fi
 
 # different kinds of installs/images have different conventions; e. g.
 # cloud-init sources *.cfg, a Debian desktop sources only prefix-less files
 if grep -q 'source-directory .*interfaces.d' /etc/network/interfaces; then
     IFACE_CFG=/etc/network/interfaces.d/${IFACE}
+    IFACE_DUMMY_CFG=/etc/network/interfaces.d/${IFACE_DUMMY}
 elif grep -q 'source .*interfaces.d.*cfg' /etc/network/interfaces; then
     IFACE_CFG=/etc/network/interfaces.d/${IFACE}.cfg
+    IFACE_DUMMY_CFG=/etc/network/interfaces.d/${IFACE_DUMMY}.cfg
+elif grep -q 'source .*interfaces.d.*conf' /etc/network/interfaces; then
+    IFACE_CFG=/etc/network/interfaces.d/${IFACE}.conf
+    IFACE_DUMMY_CFG=/etc/network/interfaces.d/${IFACE_DUMMY}.conf
 else
-    echo "SKIP: /etc/network/interfaces does not include interfaces.d/"
-    exit 0
+    echo "making /etc/network/interfaces source /e/n/interfaces.d/*.conf"
+cat <<EOF > /etc/network/interfaces
+source /etc/network/interfaces.d/*.conf
+EOF
+    IFACE_CFG=/etc/network/interfaces.d/${IFACE}.conf
+    IFACE_DUMMY_CFG=/etc/network/interfaces.d/${IFACE_DUMMY}.conf
 fi
 
+if [ -z "$AUTOPKGTEST_REBOOT_MARK" ]; then
 cat <<EOF > $IFACE_CFG
 allow-hotplug $IFACE
 iface $IFACE inet static
     address 192.168.234.129
     netmask 255.255.255.0
 EOF
+fi
 
 # these should trigger uevents and ifup@.service
 ip link add name $IFACE type veth peer name v$IFACE
@@ -58,3 +74,42 @@ if echo "$OUT" | grep -q 'inet'; then
     echo "$OUT" >&2
     exit 1
 fi
+
+echo "restarting network"
+systemctl restart networking
+
+sleep 3
+
+echo "stop"
+systemctl stop networking
+
+if [ -z "$AUTOPKGTEST_REBOOT_MARK" ]; then
+    echo "adding a dummy unplugged interface"
+cat <<EOF > $IFACE_DUMMY_CFG
+allow-hotplug $IFACE_DUMMY
+iface $IFACE_DUMMY inet dhcp
+EOF
+fi
+
+echo "start"
+systemctl start networking
+
+ip link show
+
+ip a
+
+echo "query"
+ifquery $IFACE_DUMMY
+echo "query state"
+! ifquery --state $IFACE_DUMMY
+if [ -d /run/systemd/system ]; then
+    ! systemctl status -l ifup@${IFACE_DUMMY}.service
+fi
+
+date -R
+
+if [ -z "$AUTOPKGTEST_REBOOT_MARK" ]; then
+    echo "preparing to reboot"; /tmp/autopkgtest-reboot mark1
+fi
+
+echo "test end"
diff --git a/examples/ping-places.sh b/examples/ping-places.sh
index 6f6f2e1..aace711 100644
--- a/examples/ping-places.sh
+++ b/examples/ping-places.sh
@@ -2,10 +2,10 @@
 
 if [ `id -u` -ne 0 ] || [ "$1" = "" ]; then exit 1; fi
 
-if [ -x /usr/bin/fping ]; then
-	PING="/usr/bin/fping"
+if [ -x "$(command -v fping)" ]; then
+	PING="fping"
 else
-	PING="/bin/ping -c 2"
+	PING="ping -c 2"
 fi
 
 iface="$1"
diff --git a/ifup.8 b/ifup.8
index 728eab6..6ed49b6 100644
--- a/ifup.8
+++ b/ifup.8
@@ -76,7 +76,7 @@ in
 .I /etc/network/interfaces
 will be brought down.
 .TP
-.B \-\-force
+.BR \-f ", " \-\-force
 Force configuration or deconfiguration of the interface.
 .TP
 .B \-\-ignore-errors
diff --git a/inet.defn b/inet.defn
index 6f70c49..bb78fa3 100644
--- a/inet.defn
+++ b/inet.defn
@@ -78,16 +78,15 @@ method manual
 method dhcp
   description
     This method may be used to obtain an address via DHCP with any of
-    the tools: dhclient, pump, udhcpc, dhcpcd.
+    the tools: dhclient, udhcpc, dhcpcd.
     (They have been listed in their order of precedence.)
     If you have a complicated DHCP setup you should
     note that some of these clients use their own configuration files
     and do not obtain their configuration information via *ifup*.
 
   options
-    hostname hostname       -- Hostname to be requested (pump, dhcpcd, udhcpc)
+    hostname hostname       -- Hostname to be requested (dhcpcd, udhcpc)
     metric metric           -- Metric for added routes (dhclient)
-    leasehours leasehours   -- Preferred lease time in hours (pump)
     leasetime leasetime     -- Preferred lease time in seconds (dhcpcd)
     vendor vendor_id        -- Vendor class identifier (dhcpcd)
     client client_id        -- Client identifier (dhcpcd), or "no" (dhclient)
@@ -98,28 +97,28 @@ method dhcp
 
   up
     [[ip link set dev %iface% address %hwaddress%]]
+<<<<<<< inet.defn
     CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] /sbin/dhclient -1 -4 -v $CLIENT -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+=======
+    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -1 -4 -v $CLIENT -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+>>>>>>> inet.defn
 	[[-e IF_METRIC=%metric%]] \
-        if (execable("/sbin/dhclient"))
-    /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
-        elsif (execable("/sbin/pump"))
-    /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \
-        elsif (execable("/sbin/udhcpc"))
-    /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
+        if (execable("dhclient"))
+    udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \
+        elsif (execable("udhcpc"))
+    dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
            [[-l %leasetime%]] [[-m %metric%]] %iface% \
-        elsif (execable("/sbin/dhcpcd"))
+        elsif (execable("dhcpcd"))
     echo 'No DHCP client software found!' >&2; false \
         elsif (1)
 
   down
-    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] /sbin/dhclient -4 -v $CLIENT -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
-        if (execable("/sbin/dhclient"))
-    /sbin/pump -i %iface% -r \
-        elsif (execable("/sbin/pump"))
-    if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface%.pid); fi \
-        elsif (execable("/sbin/udhcpc"))
-    /sbin/dhcpcd -k %iface% \
-        elsif (execable("/sbin/dhcpcd"))
+    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -4 -v $CLIENT -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+        if (execable("dhclient"))
+    if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(cat /run/udhcpc.%iface%.pid); kill -TERM $(cat /run/udhcpc.%iface%.pid); fi \
+        elsif (execable("udhcpc"))
+    dhcpcd -k %iface% \
+        elsif (execable("dhcpcd"))
     echo 'No DHCP client software found!' >&2; false \
         elsif (1)
 
@@ -138,7 +137,7 @@ method bootp
                       whatever it really is.
 
   up
-    /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
+    bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
            [[--hwaddr %hwaddr%]] --returniffail --serverbcast
 
   down
@@ -179,9 +178,9 @@ method ppp
     unit number    -- Use /number/ as the ppp unit number.
     options string -- Pass /string/ as additional options to pon.
   up
-    /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
+    pon [[%provider%]] [[unit %unit%]] [[%options%]]
   down
-    /usr/bin/poff [[%provider%]]
+    poff [[%provider%]]
 
 method wvdial
   description
@@ -190,10 +189,10 @@ method wvdial
   options
     provider name  -- Use /name/ as the provider (from /etc/wvdial.conf).
   up
-    /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
+    start-stop-daemon --start -x /usr/bin/wvdial \
                       -p /run/wvdial.%iface%.pid -b -m -- [[ %provider% ]]
   down
-    /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
+    start-stop-daemon --stop -x /usr/bin/wvdial \
                       -p /run/wvdial.%iface%.pid -s 2
 
 
@@ -204,9 +203,9 @@ method ipv4ll
     known as APIPA or IPAC, and often colloquially referred to
     as "Zeroconf address".
   up
-    /usr/sbin/avahi-autoipd -D %iface%
+    avahi-autoipd -D %iface%
   down
-    /usr/sbin/avahi-autoipd --kill %iface%
+    avahi-autoipd --kill %iface%
 
 architecture kfreebsd
 
@@ -215,11 +214,11 @@ method loopback
     This method may be used to define the IPv4 loopback interface.
 
   up
-    /sbin/ifconfig %iface% 127.0.0.1 up \
+    ifconfig %iface% 127.0.0.1 up \
 	if (!iface_is_lo())
 
   down
-    /sbin/ifconfig %iface% down \
+    ifconfig %iface% down \
 	if (!iface_is_lo())
 
 method static
@@ -242,15 +241,15 @@ method static
     hwaddress cleanup_hwaddress
 
   up
-    [[ /sbin/ifconfig %iface% link %hwaddress%]]
-    /sbin/ifconfig %iface% %address% [[netmask %netmask%]] [[broadcast %broadcast%]] \
+    [[ ifconfig %iface% link %hwaddress%]]
+    ifconfig %iface% %address% [[netmask %netmask%]] [[broadcast %broadcast%]] \
 	[[pointopoint %pointopoint%]] [[media %media%]] [[mtu %mtu%]] \
 	up
-    [[ /sbin/route add default %gateway% ]]
+    [[ route add default %gateway% ]]
 
   down
-    [[ /sbin/route del default %gateway% 2>&1 1>/dev/null || true ]]
-    /sbin/ifconfig %iface% down
+    [[ route del default %gateway% 2>&1 1>/dev/null || true ]]
+    ifconfig %iface% down
 
 method manual
   description
@@ -283,30 +282,35 @@ method dhcp
     hwaddress cleanup_hwaddress
 
   up
+<<<<<<< inet.defn
     [[/sbin/ifconfig %iface% link %hwaddress%]]
     CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] /sbin/dhclient -1 -4 -v $CLIENT -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+=======
+    [[ifconfig %iface% link %hwaddress%]]
+    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -1 -4 -v $CLIENT -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+>>>>>>> inet.defn
 	[[-e IF_METRIC=%metric%]] \
-        if (execable("/sbin/dhclient"))
-    /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
+        if (execable("dhclient"))
+    udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
            [[-c %client%]] \
-        elsif (execable("/sbin/udhcpc"))
-    /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
+        elsif (execable("udhcpc"))
+    dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
            [[-l %leasetime%]] %iface% \
-        elsif (execable("/sbin/dhcpcd"))
+        elsif (execable("dhcpcd"))
     echo 'No DHCP client software found!' >&2; false \
         elsif (1)
 
   down
-    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] /sbin/dhclient -4 -v $CLIENT -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
-        if (execable("/sbin/dhclient"))
-    if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface%.pid); fi \
-        elsif (execable("/sbin/udhcpc"))
-    /sbin/dhcpcd -k %iface% \
-        elsif (execable("/sbin/dhcpcd"))
+    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -4 -v $CLIENT -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+        if (execable("dhclient"))
+    if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(cat /run/udhcpc.%iface%.pid); kill -TERM $(cat /run/udhcpc.%iface%.pid); fi \
+        elsif (execable("udhcpc"))
+    dhcpcd -k %iface% \
+        elsif (execable("dhcpcd"))
     echo 'No DHCP client software found!' >&2; false \
         elsif (1)
 
-    /sbin/ifconfig %iface% down
+    ifconfig %iface% down
 
 method bootp
   description
@@ -320,11 +324,11 @@ method bootp
                       whatever it really is.
 
   up
-    /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
+    bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
            [[--hwaddr %hwaddr%]] --returniffail --serverbcast
 
   down
-    /sbin/ifconfig %iface% down
+    ifconfig %iface% down
 
 method ppp
   description
@@ -335,9 +339,9 @@ method ppp
     unit number    -- Use /number/ as the ppp unit number.
     options string -- Pass /string/ as additional options to pon.
   up
-    /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
+    pon [[%provider%]] [[unit %unit%]] [[%options%]]
   down
-    /usr/bin/poff [[%provider%]]
+    poff [[%provider%]]
 
 method wvdial
   description
@@ -346,10 +350,10 @@ method wvdial
   options
     provider name  -- Use /name/ as the provider (from /etc/wvdial.conf).
   up
-    /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
+    start-stop-daemon --start -x /usr/bin/wvdial \
                       -p /run/wvdial.%iface%.pid -b -m -- [[ %provider% ]]
   down
-    /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
+    start-stop-daemon --stop -x /usr/bin/wvdial \
                       -p /run/wvdial.%iface%.pid -s 2
 
 
@@ -360,9 +364,9 @@ method ipv4ll
     known as APIPA or IPAC, and often colloquially referred to
     as "Zeroconf address".
   up
-    /usr/sbin/avahi-autoipd -D %iface%
+    avahi-autoipd -D %iface%
   down
-    /usr/sbin/avahi-autoipd --kill %iface%
+    avahi-autoipd --kill %iface%
 architecture hurd
 
 method loopback
@@ -436,24 +440,30 @@ method dhcp
 
   up
     [[Warning: Option hwaddress: %hwaddress% not yet supported]]
+<<<<<<< inet.defn
     CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] /sbin/dhclient -1 -4 -v $CLIENT -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
         if (execable("/sbin/dhclient"))
     /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \
+=======
+    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -1 -4 -v $CLIENT -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
+        if (execable("dhclient"))
+    udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \
+>>>>>>> inet.defn
            [[-c %client%]] \
-        elsif (execable("/sbin/udhcpc"))
-    /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
+        elsif (execable("udhcpc"))
+    dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
            [[-l %leasetime%]] %iface% \
-        elsif (execable("/sbin/dhcpcd"))
+        elsif (execable("dhcpcd"))
     echo 'No DHCP client software found!' >&2; false \
         elsif (1)
 
   down
-    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] /sbin/dhclient -4 -v $CLIENT -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
-        if (execable("/sbin/dhclient"))
-    if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface///.%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface///.%.pid); fi \
-        elsif (execable("/sbin/udhcpc"))
-    /sbin/dhcpcd -k %iface% \
-        elsif (execable("/sbin/dhcpcd"))
+    CLIENT="-i"; [[[ "%client%" = no ] && CLIENT="";]] dhclient -4 -v $CLIENT -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
+        if (execable("dhclient"))
+    if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2 $(cat /run/udhcpc.%iface///.%.pid); kill -TERM $(cat /run/udhcpc.%iface///.%.pid); fi \
+        elsif (execable("udhcpc"))
+    dhcpcd -k %iface% \
+        elsif (execable("dhcpcd"))
     echo 'No DHCP client software found!' >&2; false \
         elsif (1)
 
@@ -486,9 +496,9 @@ method ppp
     unit number    -- Use /number/ as the ppp unit number.
     options string -- Pass /string/ as additional options to pon.
   up
-    /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
+    pon [[%provider%]] [[unit %unit%]] [[%options%]]
   down
-    /usr/bin/poff [[%provider%]]
+    poff [[%provider%]]
 
 method wvdial
   description
@@ -497,10 +507,10 @@ method wvdial
   options
     provider name  -- Use /name/ as the provider (from /etc/wvdial.conf).
   up
-    /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
+    start-stop-daemon --start -x /usr/bin/wvdial \
                       -p /run/wvdial.%iface///.%.pid -b -m -- [[ %provider% ]]
   down
-    /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
+    start-stop-daemon --stop -x /usr/bin/wvdial \
                       -p /run/wvdial.%iface///.%.pid -s 2
 
 
@@ -511,6 +521,6 @@ method ipv4ll
     known as APIPA or IPAC, and often colloquially referred to
     as "Zeroconf address".
   up
-    /usr/sbin/avahi-autoipd -D %iface%
+    avahi-autoipd -D %iface%
   down
-    /usr/sbin/avahi-autoipd --kill %iface%
+    avahi-autoipd --kill %iface%
diff --git a/inet6.defn b/inet6.defn
index 4e5d26d..8fb6970 100644
--- a/inet6.defn
+++ b/inet6.defn
@@ -21,22 +21,33 @@ method auto
     ll-interval            -- Link-local address polling interval in seconds [0.1]
 
   up
-    /sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
-    -[[/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.use_tempaddr=%privext%]]
-    -/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.accept_ra=%accept_ra%
-    -/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.autoconf=1
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+    -[[sysctl -q -e -w net.ipv6.conf.%iface/.//%.use_tempaddr=%privext%]]
+    -sysctl -q -e -w net.ipv6.conf.%iface/.//%.accept_ra=%accept_ra%
+    -sysctl -q -e -w net.ipv6.conf.%iface/.//%.autoconf=1
     ip addr flush dev %iface% mngtmpaddr \
         if (var_set("accept_ra", ifd) && !var_true("accept_ra", ifd))
     ip link set dev %iface% up
     /lib/ifupdown/wait-for-ll6.sh if (var_true("dhcp", ifd) && execable("/lib/ifupdown/wait-for-ll6.sh"))
+<<<<<<< inet6.defn
     /sbin/dhclient -1 -6 -v -P -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (var_true("dhcp", ifd) && execable("/sbin/dhclient") && var_true("request_prefix", ifd))
     /sbin/dhclient -1 -6 -v -S -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         elsif (var_true("dhcp", ifd) && execable("/sbin/dhclient"))
+=======
+    dhclient -6 -1 -v -P -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+        if (var_true("dhcp", ifd) && execable("dhclient") && var_true("request_prefix", ifd))
+    dhclient -6 -1 -v -S -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+        elsif (var_true("dhcp", ifd) && execable("dhclient"))
+>>>>>>> inet6.defn
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (var_true("dhcp", ifd))
 
   down
+    dhclient -6 -v -r -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+        if (var_true("dhcp", ifd) && execable("dhclient"))
+    echo 'No DHCPv6 client software found!' >&2; false \
+        elsif (var_true("dhcp", ifd))
     ip -6 addr flush dev %iface% scope global
     ip link set dev %iface% down \
 		if (iface_is_link())
@@ -82,11 +93,11 @@ method static
     gateway (if_set 0) =accept_ra?
 
   up
-    /sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
-    -[[/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.use_tempaddr=%privext%]]
-    -[[/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.accept_ra=%accept_ra%]]
-    -[[/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.autoconf=%autoconf%]]
-    -[[if [ "$(/bin/cat /sys/class/net/%iface%/mtu)" -lt %mtu% ]; then ip link set dev %iface% mtu %mtu%; else /sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.mtu=%mtu%; fi]]
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+    -[[sysctl -q -e -w net.ipv6.conf.%iface/.//%.use_tempaddr=%privext%]]
+    -[[sysctl -q -e -w net.ipv6.conf.%iface/.//%.accept_ra=%accept_ra%]]
+    -[[sysctl -q -e -w net.ipv6.conf.%iface/.//%.autoconf=%autoconf%]]
+    -[[if [ "$(cat /sys/class/net/%iface%/mtu)" -lt %mtu% ]; then ip link set dev %iface% mtu %mtu%; else sysctl -q -e -w net.ipv6.conf.%iface/.//%.mtu=%mtu%; fi]]
     ip addr flush dev %iface% mngtmpaddr \
         if (var_set("accept_ra", ifd) && !var_true("accept_ra", ifd))
     ip link set dev %iface% [[address %hwaddress%]] up
@@ -119,7 +130,7 @@ method manual
     hwaddress cleanup_hwaddress
 
   up
-    -[[if [ "$(/bin/cat /sys/class/net/%iface%/mtu)" -lt %mtu% ]; then ip link set dev %iface% mtu %mtu%; else /sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.mtu=%mtu%; fi]]
+    -[[if [ "$(cat /sys/class/net/%iface%/mtu)" -lt %mtu% ]; then ip link set dev %iface% mtu %mtu%; else sysctl -q -e -w net.ipv6.conf.%iface/.//%.mtu=%mtu%; fi]]
     [[ip link set dev %iface% address %hwaddress%]]
     ip link set dev %iface% up 2>/dev/null || true
 
@@ -147,29 +158,69 @@ method dhcp
     hwaddress cleanup_hwaddress
 
   up
-    /sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
-    -[[/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.accept_ra=%accept_ra%]]
-    -[[/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.autoconf=%autoconf%]]
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+    -[[sysctl -q -e -w net.ipv6.conf.%iface/.//%.accept_ra=%accept_ra%]]
+    -[[sysctl -q -e -w net.ipv6.conf.%iface/.//%.autoconf=%autoconf%]]
     ip addr flush dev %iface% mngtmpaddr \
         if (var_set("accept_ra", ifd) && !var_true("accept_ra", ifd))
     ip link set dev %iface% [[address %hwaddress%]] up
     /lib/ifupdown/wait-for-ll6.sh if (execable("/lib/ifupdown/wait-for-ll6.sh"))
+<<<<<<< inet6.defn
     /sbin/dhclient -1 -6 -v -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -P -N -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (execable("/sbin/dhclient") && var_true("request_prefix", ifd))
     /sbin/dhclient -1 -6 -v -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         elsif (execable("/sbin/dhclient"))
+=======
+    dhclient -1 -6 -v -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -P -N -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+        if (execable("dhclient") && var_true("request_prefix", ifd))
+    dhclient -1 -6 -v -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+        elsif (execable("dhclient"))
+>>>>>>> inet6.defn
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (1)
 
   down
-    /sbin/dhclient -6 -v -r -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
-        if (execable("/sbin/dhclient"))
+    dhclient -6 -v -r -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+        if (execable("dhclient"))
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (1)
 
     ip link set dev %iface% down \
 		if (iface_is_link())
 
+method tunnel
+  description
+    This method is used to create IP6GRE, IP6IP6 or IPIP6 tunnels. You need to
+    have the *ip* binary from the *iproute* package. For IP6GRE tunnels, you
+    will need to load the ip6_gre module and the ip6_tunnel module for
+    IP6IP6 or IPIP6 tunnels.
+  options
+    address address       -- Local Address (colon delimited)
+    netmask mask          -- Netmask (number of bits, eg 64)
+    mode type             -- Tunnel type (either IP6GRE, IP6IP6 or IPIP6) *required*
+    endpoint address      -- Address of other tunnel endpoint (colon delimited) *required*
+    dstaddr address       -- Remote address (remote address inside tunnel)
+    local address         -- Address of the local endpoint (colon delimited)
+    metric metric         -- Routing metric for default gateway (integer)
+    gateway address       -- Default gateway (colon delimited)
+    ttl time              -- TTL setting
+    mtu size              -- MTU size
+    encaplimit limit      -- Encapsulation limit ("none" or integer)
+  up
+    ip -6 tunnel add %iface% mode %mode% remote %endpoint% [[local %local%]] \
+       [[ttl %ttl%]] [[encaplimit %encaplimit%]]
+    ip link set %iface% up [[mtu %mtu%]]
+    [[ip -4 addr add %address%/%netmask% dev %iface% [[peer %dstaddr%]] ]] \
+      if (!var_strcasecmp("mode", "ipip6"))
+    [[ip -4 route add 0.0.0.0/0 via %gateway% [[metric %metric%]] dev %iface% onlink ]] \
+      if (!var_strcasecmp("mode", "ipip6"))
+    [[ip -6 addr add %address%/%netmask% dev %iface% [[peer %dstaddr%]] ]] \
+      if (var_strcasecmp("mode", "ipip6"))
+    [[ip -6 route add ::/0 via %gateway% [[metric %metric%]] dev %iface% onlink ]] \
+      if (var_strcasecmp("mode", "ipip6"))
+  down
+    ip -6 tunnel del %iface%
+
 method v4tunnel
   description
     This method may be used to setup an IPv6-over-IPv4 tunnel. It requires
@@ -192,7 +243,7 @@ method v4tunnel
     preferred-lifetime set_preferred_lft
 
   up
-    /sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
     ip tunnel add %iface% mode sit remote %endpoint% [[local %local%]] \
        [[ttl %ttl%]]
     ip link set %iface% up [[mtu %mtu%]]
@@ -221,7 +272,7 @@ method 6to4
     preferred-lifetime set_preferred_lft
 
   up
-    /sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
     ip tunnel add %iface% mode sit remote any local %local% \
        [[ttl %ttl%]]
     ip link set %iface% up [[mtu %mtu%]]
@@ -240,10 +291,10 @@ method loopback
   description
     This method may be used to define the IPv6 loopback interface.
   up
-    /sbin/ifconfig %iface% inet6 ::1 \
+    ifconfig %iface% inet6 ::1 \
 	if (!iface_is_lo())
   down
-    /sbin/ifconfig %iface% down \
+    ifconfig %iface% down \
 	if (!iface_is_lo())
 
 method static
@@ -263,14 +314,14 @@ method static
     hwaddress cleanup_hwaddress
 
   up
-    /sbin/ifconfig %iface% [[media %media%]] [[link %hwaddress%]] [[mtu %mtu%]] up
-    /sbin/ifconfig %iface% inet6 %address%[[/%netmask%]] alias
-    [[ /sbin/route add -inet6 ::/0 %gateway% ]]
+    ifconfig %iface% [[media %media%]] [[link %hwaddress%]] [[mtu %mtu%]] up
+    ifconfig %iface% inet6 %address%[[/%netmask%]] alias
+    [[ route add -inet6 ::/0 %gateway% ]]
 
   down
-    [[ /sbin/route -n del -inet6 ::/0 2>&1 1>/dev/null || true ]]
-    [[ /sbin/ifconfig %iface% inet6 %address% -alias ]]
-    /sbin/ifconfig %iface% down
+    [[ route -n del -inet6 ::/0 2>&1 1>/dev/null || true ]]
+    [[ ifconfig %iface% inet6 %address% -alias ]]
+    ifconfig %iface% down
 
 method manual
   description
@@ -300,14 +351,20 @@ method auto
     hwaddress cleanup_hwaddress
 
   up
+<<<<<<< inet6.defn
     /sbin/ifconfig %iface% inet6 accept_rtadv up
     /sbin/dhclient -1 -6 -S -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (var_true("dhcp", ifd) && execable("/sbin/dhclient"))
+=======
+    ifconfig %iface% inet6 accept_rtadv up
+    dhclient -1 -6 -S -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+        if (var_true("dhcp", ifd) && execable("dhclient"))
+>>>>>>> inet6.defn
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (var_true("dhcp", ifd))
 
   down
-    /sbin/ifconfig %iface% down
+    ifconfig %iface% down
 
 
 
@@ -324,19 +381,25 @@ method dhcp
     hwaddress cleanup_hwaddress
 
   up
+<<<<<<< inet6.defn
     /sbin/ifconfig %iface% [[link %hwaddress%]] up
     /sbin/dhclient -1 -6 -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (execable("/sbin/dhclient"))
+=======
+    ifconfig %iface% [[link %hwaddress%]] up
+    dhclient -1 -6 -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+        if (execable("dhclient"))
+>>>>>>> inet6.defn
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (1)
 
   down
-    /sbin/dhclient -6 -r -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
-        if (execable("/sbin/dhclient"))
+    dhclient -6 -r -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+        if (execable("dhclient"))
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (1)
 
-    /sbin/ifconfig %iface% down
+    ifconfig %iface% down
 
 architecture hurd
 
@@ -397,14 +460,19 @@ method dhcp
   up
     [[Warning: Option hwaddress: %hwaddress% not yet supported]]
     inetutils-ifconfig --interface %iface% --up
+<<<<<<< inet6.defn
     /sbin/dhclient -1 -6 -pf /run/dhclient6.%iface///.%.pid -lf /var/lib/dhcp/dhclient6.%iface///.%.leases -I -df /var/lib/dhcp/dhclient.%iface///.%.leases %iface% \
         if (execable("/sbin/dhclient"))
+=======
+    dhclient -1 -6 -pf /run/dhclient6.%iface///.%.pid -lf /var/lib/dhcp/dhclient6.%iface///.%.leases -I -df /var/lib/dhcp/dhclient.%iface///.%.leases %iface% \
+        if (execable("dhclient"))
+>>>>>>> inet6.defn
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (1)
 
   down
-    /sbin/dhclient -6 -r -pf /run/dhclient6.%iface///.%.pid -lf /var/lib/dhcp/dhclient6.%iface///.%.leases -I -df /var/lib/dhcp/dhclient.%iface///.%.leases %iface% \
-        if (execable("/sbin/dhclient"))
+    dhclient -6 -r -pf /run/dhclient6.%iface///.%.pid -lf /var/lib/dhcp/dhclient6.%iface///.%.leases -I -df /var/lib/dhcp/dhclient.%iface///.%.leases %iface% \
+        if (execable("dhclient"))
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (1)
 
diff --git a/interfaces.5.pre b/interfaces.5.pre
index 1278fb1..7c3bdf4 100644
--- a/interfaces.5.pre
+++ b/interfaces.5.pre
@@ -346,9 +346,7 @@ prints an error message,
 and exits with status 0.
 This behavior may change in the future.
 .TP
-.BI up " command"
-.TP
-.BI post\-up " command"
+\fBup\fR \fIcommand\fR, \fBpost\-up\fR \fIcommand
 Run
 .I command
 after bringing the interface up.
@@ -361,9 +359,7 @@ prints an error message,
 and exits with status 0.
 This behavior may change in the future.
 .TP
-.BI down " command"
-.TP
-.BI pre\-down " command"
+\fBdown\fR \fIcommand\fR, \fBpre\-down\fR \fIcommand\fR
 Run
 .I command
 before taking the interface down.
diff --git a/link.defn b/link.defn
index 8240e99..aa38634 100644
--- a/link.defn
+++ b/link.defn
@@ -27,8 +27,10 @@ method none
 	if (iface_is_lo())
     [[ip link set %iface0% alias "%description%"]]
   down
-    if test `cat /sys/class/net/%link%/type` -eq 32; then \
-        echo 0x%vlan_id1% > /sys/class/net/%link%/delete_child; \
+    if test -d /sys/class/net/%link%/device/infiniband; then \
+        if test `cat /sys/class/net/%link%/type` -eq 32; then \
+            echo 0x%vlan_id1% > /sys/class/net/%link%/delete_child; \
+        fi \
     else \
         ip link del %iface%; \
     fi if (iface_has(".") && !iface_has(":"))
@@ -47,17 +49,17 @@ method none
     description description -- Link description []
 
   up
-    -/sbin/ifconfig %iface% 127.0.0.1 up \
+    -ifconfig %iface% 127.0.0.1 up \
 	if (iface_is_lo())
-    -/sbin/ifconfig %iface% inet6 ::1 \
+    -ifconfig %iface% inet6 ::1 \
 	if (iface_is_lo())
-    [[-/sbin/ifconfig %iface% desc "%description%"]]
+    [[-ifconfig %iface% desc "%description%"]]
   down
-    -/sbin/ifconfig %iface% down \
+    -ifconfig %iface% down \
 	if (iface_is_lo())
-    [[-test -n "%description%" && /sbin/ifconfig %iface% -desc]]
+    [[-test -n "%description%" && ifconfig %iface% -desc]]
   rename
-    /sbin/ifconfig %iface% name %newname%
+    ifconfig %iface% name %newname%
 
 architecture hurd
 
diff --git a/main.c b/main.c
index fe69585..47747ed 100644
--- a/main.c
+++ b/main.c
@@ -94,7 +94,7 @@ static void help(int (*cmds) (interface_defn *)) {
 		"\t--no-loopback          don't act specially on the loopback device\n");
 
 	if (!(cmds == iface_list) && !(cmds == iface_query))
-		printf(	"\t--force                force de/configuration\n"
+		printf(	"\t-f, --force            force de/configuration\n"
 			"\t--ignore-errors        ignore errors\n");
 
 	if ((cmds == iface_list) || (cmds == iface_query))
@@ -419,7 +419,7 @@ static void parse_environment_variables(void) {
 			excludeint = realloc(excludeint, excludeints * sizeof *excludeint);
 			if (excludeint == NULL)
 				err(1, "realloc");
-			excludeint[excludeints - 1] = tok;
+			excludeint[excludeints - 1] = strdup(tok);
 		}
 		free(excludes);
 	}
@@ -439,7 +439,7 @@ static void parse_options(int *argc, char **argv[]) {
 		{"no-mappings", no_argument, NULL, 1},
 		{"no-scripts", no_argument, NULL, 4},
 		{"no-loopback", no_argument, NULL, 5},
-		{"force", no_argument, NULL, 2},
+		{"force", no_argument, NULL, 'f'},
 		{"ignore-errors", no_argument, NULL, 7},
 		{"option", required_argument, NULL, 'o'},
 		{"list", no_argument, NULL, 'l'},
@@ -450,7 +450,7 @@ static void parse_options(int *argc, char **argv[]) {
 	};
 
 	for (;;) {
-		int c = getopt_long(*argc, *argv, "X:s:i:o:hVvnal", long_opts, NULL);
+		int c = getopt_long(*argc, *argv, "X:s:i:o:hVvnalf", long_opts, NULL);
 
 		if (c == EOF)
 			break;
@@ -526,7 +526,7 @@ static void parse_options(int *argc, char **argv[]) {
 			run_mappings = false;
 			break;
 
-		case 2: /* --force */
+		case 'f': /* --force */
 			if ((cmds == iface_list) || (cmds == iface_query))
 				usage();
 			force = true;
diff --git a/tests/kfreebsd/down.1 b/tests/kfreebsd/down.1
index 7d112be..1eefc16 100644
--- a/tests/kfreebsd/down.1
+++ b/tests/kfreebsd/down.1
@@ -5,7 +5,7 @@ run-parts --verbose /etc/network/if-down.d
 ifdown: configuring interface eth0=eth0 (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth0 down
+ifconfig eth0 down
 run-parts --verbose /etc/network/if-post-down.d
 
 run-parts --verbose /etc/network/if-post-down.d
diff --git a/tests/kfreebsd/down.2 b/tests/kfreebsd/down.2
index edfc43c..0601908 100644
--- a/tests/kfreebsd/down.2
+++ b/tests/kfreebsd/down.2
@@ -5,37 +5,37 @@ run-parts --verbose /etc/network/if-down.d
 ifdown: configuring interface eth5=eth5 (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth5 down
+ifconfig eth5 down
 run-parts --verbose /etc/network/if-post-down.d
 
 ifdown: configuring interface eth4=eth4 (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth4 down
+ifconfig eth4 down
 run-parts --verbose /etc/network/if-post-down.d
 
 ifdown: configuring interface eth3=eth3 (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth3 down
+ifconfig eth3 down
 run-parts --verbose /etc/network/if-post-down.d
 
 ifdown: configuring interface eth2=eth2 (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth2 down
+ifconfig eth2 down
 run-parts --verbose /etc/network/if-post-down.d
 
 ifdown: configuring interface eth1=eth1 (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth1 down
+ifconfig eth1 down
 run-parts --verbose /etc/network/if-post-down.d
 
 ifdown: configuring interface eth0=eth0 (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth0 down
+ifconfig eth0 down
 run-parts --verbose /etc/network/if-post-down.d
 
 run-parts --verbose /etc/network/if-post-down.d
diff --git a/tests/kfreebsd/down.3 b/tests/kfreebsd/down.3
index 2061a6d..d5d32e8 100644
--- a/tests/kfreebsd/down.3
+++ b/tests/kfreebsd/down.3
@@ -5,13 +5,13 @@ run-parts --verbose /etc/network/if-down.d
 ifdown: configuring interface eth0=eth0 (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth0 down
+ifconfig eth0 down
 run-parts --verbose /etc/network/if-post-down.d
 ifdown: configuring interface eth0=eth0 (inet6)
 run-parts --verbose /etc/network/if-down.d
- /sbin/route -n del -inet6 ::/0 2>&1 1>/dev/null || true 
- /sbin/ifconfig eth0 inet6 3ffe:ffff:100:f101::1 -alias 
-/sbin/ifconfig eth0 down
+ route -n del -inet6 ::/0 2>&1 1>/dev/null || true 
+ ifconfig eth0 inet6 3ffe:ffff:100:f101::1 -alias 
+ifconfig eth0 down
 run-parts --verbose /etc/network/if-post-down.d
 
 run-parts --verbose /etc/network/if-post-down.d
diff --git a/tests/kfreebsd/down.4 b/tests/kfreebsd/down.4
index 7405824..e7b538d 100644
--- a/tests/kfreebsd/down.4
+++ b/tests/kfreebsd/down.4
@@ -4,6 +4,6 @@ exit code: 0
 ifdown: configuring interface eth0=work (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth0 down
+ifconfig eth0 down
 run-parts --verbose /etc/network/if-post-down.d
 
diff --git a/tests/kfreebsd/down.5 b/tests/kfreebsd/down.5
index 7d112be..1eefc16 100644
--- a/tests/kfreebsd/down.5
+++ b/tests/kfreebsd/down.5
@@ -5,7 +5,7 @@ run-parts --verbose /etc/network/if-down.d
 ifdown: configuring interface eth0=eth0 (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth0 down
+ifconfig eth0 down
 run-parts --verbose /etc/network/if-post-down.d
 
 run-parts --verbose /etc/network/if-post-down.d
diff --git a/tests/kfreebsd/down.6 b/tests/kfreebsd/down.6
index 7d112be..1eefc16 100644
--- a/tests/kfreebsd/down.6
+++ b/tests/kfreebsd/down.6
@@ -5,7 +5,7 @@ run-parts --verbose /etc/network/if-down.d
 ifdown: configuring interface eth0=eth0 (inet)
 run-parts --verbose /etc/network/if-down.d
 
-/sbin/ifconfig eth0 down
+ifconfig eth0 down
 run-parts --verbose /etc/network/if-post-down.d
 
 run-parts --verbose /etc/network/if-post-down.d
diff --git a/tests/kfreebsd/up.1 b/tests/kfreebsd/up.1
index cfdf815..899584c 100644
--- a/tests/kfreebsd/up.1
+++ b/tests/kfreebsd/up.1
@@ -6,7 +6,7 @@ run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 ifup: configuring interface eth0=eth0 (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
-/sbin/ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
+ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
 
 echo hi
 echo hello
diff --git a/tests/kfreebsd/up.2 b/tests/kfreebsd/up.2
index c513a45..8a4d2df 100644
--- a/tests/kfreebsd/up.2
+++ b/tests/kfreebsd/up.2
@@ -6,42 +6,42 @@ run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 ifup: configuring interface eth0=eth0 (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
-/sbin/ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
+ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
 
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 
 ifup: configuring interface eth1=eth1 (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
-/sbin/ifconfig eth1 1.3.4.5 netmask 255.255.255.0  	   	up
+ifconfig eth1 1.3.4.5 netmask 255.255.255.0  	   	up
 
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 
 ifup: configuring interface eth2=eth2 (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
-/sbin/ifconfig eth2 1.4.5.6 netmask 255.255.255.0  	   	up
+ifconfig eth2 1.4.5.6 netmask 255.255.255.0  	   	up
 
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 
 ifup: configuring interface eth3=eth3 (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
-/sbin/ifconfig eth3 1.5.6.7 netmask 255.255.255.0  	   	up
+ifconfig eth3 1.5.6.7 netmask 255.255.255.0  	   	up
 
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 
 ifup: configuring interface eth4=eth4 (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
-/sbin/ifconfig eth4 1.7.8.9 netmask 255.255.255.0  	   	up
+ifconfig eth4 1.7.8.9 netmask 255.255.255.0  	   	up
 
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 
 ifup: configuring interface eth5=eth5 (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
-/sbin/ifconfig eth5 1.8.9.10 netmask 255.255.255.0  	   	up
+ifconfig eth5 1.8.9.10 netmask 255.255.255.0  	   	up
 
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 run-parts --exit-on-error --verbose /etc/network/if-up.d
diff --git a/tests/kfreebsd/up.3 b/tests/kfreebsd/up.3
index 87964f2..3e063d5 100644
--- a/tests/kfreebsd/up.3
+++ b/tests/kfreebsd/up.3
@@ -6,13 +6,13 @@ run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 ifup: configuring interface eth0=eth0 (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
-/sbin/ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
+ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
 
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth0=eth0 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/ifconfig eth0    up
-/sbin/ifconfig eth0 inet6 3ffe:ffff:100:f101::1/64 alias
+ifconfig eth0    up
+ifconfig eth0 inet6 3ffe:ffff:100:f101::1/64 alias
 
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 run-parts --exit-on-error --verbose /etc/network/if-up.d
diff --git a/tests/kfreebsd/up.4 b/tests/kfreebsd/up.4
index 177c87e..a9c6671 100644
--- a/tests/kfreebsd/up.4
+++ b/tests/kfreebsd/up.4
@@ -5,7 +5,7 @@ exit code: 0
 ifup: configuring interface eth0=work (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
-/sbin/ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
+ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
 
 echo hi
 echo hello
diff --git a/tests/kfreebsd/up.5 b/tests/kfreebsd/up.5
index d1a02ef..801e95e 100644
--- a/tests/kfreebsd/up.5
+++ b/tests/kfreebsd/up.5
@@ -5,8 +5,8 @@ run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
 ifup: configuring interface eth0=eth0 (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
- /sbin/ifconfig eth0 link 00:DE:AD:00:BE:AF
-/sbin/ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
+ ifconfig eth0 link 00:DE:AD:00:BE:AF
+ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
 
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 run-parts --exit-on-error --verbose /etc/network/if-up.d
diff --git a/tests/kfreebsd/up.6 b/tests/kfreebsd/up.6
index d1a02ef..801e95e 100644
--- a/tests/kfreebsd/up.6
+++ b/tests/kfreebsd/up.6
@@ -5,8 +5,8 @@ run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
 
 ifup: configuring interface eth0=eth0 (inet)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
- /sbin/ifconfig eth0 link 00:DE:AD:00:BE:AF
-/sbin/ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
+ ifconfig eth0 link 00:DE:AD:00:BE:AF
+ifconfig eth0 1.2.3.4 netmask 255.255.255.0  	   	up
 
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 run-parts --exit-on-error --verbose /etc/network/if-up.d
diff --git a/tests/linux/down.19 b/tests/linux/down.19
new file mode 100644
index 0000000..344adea
--- /dev/null
+++ b/tests/linux/down.19
@@ -0,0 +1,28 @@
+exit code: 0
+====stdout====
+====stderr====
+ifdown: configuring interface tunnel1=tunnel1 (inet6)
+run-parts --verbose /etc/network/if-down.d
+ip -6 tunnel del tunnel1
+run-parts --verbose /etc/network/if-post-down.d
+
+ifdown: configuring interface tunnel2=tunnel2 (inet6)
+run-parts --verbose /etc/network/if-down.d
+ip -6 tunnel del tunnel2
+run-parts --verbose /etc/network/if-post-down.d
+
+ifdown: configuring interface tunnel3=tunnel3 (inet6)
+run-parts --verbose /etc/network/if-down.d
+ip -6 tunnel del tunnel3
+run-parts --verbose /etc/network/if-post-down.d
+
+ifdown: configuring interface tunnel4=tunnel4 (inet6)
+run-parts --verbose /etc/network/if-down.d
+ip -6 tunnel del tunnel4
+run-parts --verbose /etc/network/if-post-down.d
+
+ifdown: configuring interface tunnel5=tunnel5 (inet6)
+run-parts --verbose /etc/network/if-down.d
+ip -6 tunnel del tunnel5
+run-parts --verbose /etc/network/if-post-down.d
+
diff --git a/tests/linux/down.7 b/tests/linux/down.7
index 5adbcaa..6a6ff67 100644
--- a/tests/linux/down.7
+++ b/tests/linux/down.7
@@ -12,40 +12,40 @@ run-parts --verbose /etc/network/if-post-down.d
 ifdown: configuring interface br0.0202=br0.0202 (inet)
 run-parts --verbose /etc/network/if-down.d
 run-parts --verbose /etc/network/if-post-down.d
-if test `cat /sys/class/net/br0/type` -eq 32; then         echo 0x0202 > /sys/class/net/br0/delete_child;     else         ip link del br0.0202;     fi
+if test -d /sys/class/net/br0/device/infiniband; then         if test `cat /sys/class/net/br0/type` -eq 32; then             echo 0x0202 > /sys/class/net/br0/delete_child;         fi     else         ip link del br0.0202;     fi
 
 ifdown: configuring interface br0.0201=br0.0201 (inet)
 run-parts --verbose /etc/network/if-down.d
 run-parts --verbose /etc/network/if-post-down.d
-if test `cat /sys/class/net/br0/type` -eq 32; then         echo 0x0201 > /sys/class/net/br0/delete_child;     else         ip link del br0.0201;     fi
+if test -d /sys/class/net/br0/device/infiniband; then         if test `cat /sys/class/net/br0/type` -eq 32; then             echo 0x0201 > /sys/class/net/br0/delete_child;         fi     else         ip link del br0.0201;     fi
 
 ifdown: configuring interface eth0.0201=eth0.0201 (inet)
 run-parts --verbose /etc/network/if-down.d
 
 ip addr del 192.168.0.1/255.255.255.128 broadcast 192.168.0.127 	  dev eth0.0201 label eth0.0201
 run-parts --verbose /etc/network/if-post-down.d
-if test `cat /sys/class/net/eth0/type` -eq 32; then         echo 0x0201 > /sys/class/net/eth0/delete_child;     else         ip link del eth0.0201;     fi
+if test -d /sys/class/net/eth0/device/infiniband; then         if test `cat /sys/class/net/eth0/type` -eq 32; then             echo 0x0201 > /sys/class/net/eth0/delete_child;         fi     else         ip link del eth0.0201;     fi
 
 ifdown: configuring interface eth0.1=eth0.1 (inet6)
 run-parts --verbose /etc/network/if-down.d
 
 ip -6 addr del 3ffe:ffff:120:f101::1/64  dev eth0.1
 run-parts --verbose /etc/network/if-post-down.d
-if test `cat /sys/class/net/eth0/type` -eq 32; then         echo 0x1 > /sys/class/net/eth0/delete_child;     else         ip link del eth0.1;     fi
+if test -d /sys/class/net/eth0/device/infiniband; then         if test `cat /sys/class/net/eth0/type` -eq 32; then             echo 0x1 > /sys/class/net/eth0/delete_child;         fi     else         ip link del eth0.1;     fi
 
 ifdown: configuring interface eth0.1=eth0.1 (inet6)
 run-parts --verbose /etc/network/if-down.d
 
 ip -6 addr del 3ffe:ffff:120:f101::1/64  dev eth0.1
 run-parts --verbose /etc/network/if-post-down.d
-if test `cat /sys/class/net/eth0/type` -eq 32; then         echo 0x1 > /sys/class/net/eth0/delete_child;     else         ip link del eth0.1;     fi
+if test -d /sys/class/net/eth0/device/infiniband; then         if test `cat /sys/class/net/eth0/type` -eq 32; then             echo 0x1 > /sys/class/net/eth0/delete_child;         fi     else         ip link del eth0.1;     fi
 
 ifdown: configuring interface eth0.0201=eth0.0201 (inet)
 run-parts --verbose /etc/network/if-down.d
 
 ip addr del 192.168.0.1/255.255.255.128 broadcast 192.168.0.127 	  dev eth0.0201 label eth0.0201
 run-parts --verbose /etc/network/if-post-down.d
-if test `cat /sys/class/net/eth0/type` -eq 32; then         echo 0x0201 > /sys/class/net/eth0/delete_child;     else         ip link del eth0.0201;     fi
+if test -d /sys/class/net/eth0/device/infiniband; then         if test `cat /sys/class/net/eth0/type` -eq 32; then             echo 0x0201 > /sys/class/net/eth0/delete_child;         fi     else         ip link del eth0.0201;     fi
 
 ifdown: configuring interface eth0=eth0 (inet)
 run-parts --verbose /etc/network/if-down.d
diff --git a/tests/linux/down.8 b/tests/linux/down.8
index ff48663..370fd69 100644
--- a/tests/linux/down.8
+++ b/tests/linux/down.8
@@ -13,7 +13,7 @@ run-parts --verbose /etc/network/if-down.d
 
 ip addr del 2.3.4.5/255.255.255.0 broadcast 2.3.4.255 	  dev eth2.2 label eth2.2
 run-parts --verbose /etc/network/if-post-down.d
-if test `cat /sys/class/net/eth2/type` -eq 32; then         echo 0x2 > /sys/class/net/eth2/delete_child;     else         ip link del eth2.2;     fi
+if test -d /sys/class/net/eth2/device/infiniband; then         if test `cat /sys/class/net/eth2/type` -eq 32; then             echo 0x2 > /sys/class/net/eth2/delete_child;         fi     else         ip link del eth2.2;     fi
 
 ifdown: configuring interface eth1:1=eth1:1 (inet)
 run-parts --verbose /etc/network/if-down.d
diff --git a/tests/linux/testcase.19 b/tests/linux/testcase.19
new file mode 100644
index 0000000..9edbe23
--- /dev/null
+++ b/tests/linux/testcase.19
@@ -0,0 +1,43 @@
+# RUN: --no-loopback tunnel1
+iface tunnel1 inet6 tunnel
+  address fd00::1
+  netmask 48
+  mode ip6ip6
+  endpoint 2001:db8::2
+  local 2001:db8::1
+  encaplimit none
+
+# RUN: --no-loopback tunnel2
+iface tunnel2 inet6 tunnel
+  address fd00::1
+  netmask 48
+  mode ip6ip6
+  endpoint 2001:db8::2
+  local 2001:db8::1
+  encaplimit none
+  gateway fd00::2
+
+# RUN: --no-loopback tunnel3
+iface tunnel3 inet6 tunnel
+  address 192.0.2.1
+  netmask 24
+  mode ipip6
+  endpoint 2001:db8::2
+  local 2001:db8::1
+
+# RUN: --no-loopback tunnel4
+iface tunnel4 inet6 tunnel
+  address 192.0.2.1
+  netmask 24
+  mode ipip6
+  endpoint 2001:db8::2
+  local 2001:db8::1
+  gateway 192.0.2.2
+
+# RUN: --no-loopback tunnel5
+iface tunnel5 inet6 tunnel
+  address fd00::1
+  netmask 48
+  mode ip6gre
+  endpoint 2001:db8::2
+  local 2001:db8::1
diff --git a/tests/linux/up.16 b/tests/linux/up.16
index 8c07dab..5b76a9b 100644
--- a/tests/linux/up.16
+++ b/tests/linux/up.16
@@ -23,11 +23,11 @@ ip link set dev eth1 mtu 1500 address 12:34:56:89:0a:bc up
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth1=eth1 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth1.autoconf=0
-if [ "$(/bin/cat /sys/class/net/eth1/mtu)" -lt 1492 ]; then ip link set dev eth1 mtu 1492; else /sbin/sysctl -q -e -w net.ipv6.conf.eth1.mtu=1492; fi
+sysctl -q -e -w net.ipv6.conf.eth1.autoconf=0
+if [ "$(cat /sys/class/net/eth1/mtu)" -lt 1492 ]; then ip link set dev eth1 mtu 1492; else sysctl -q -e -w net.ipv6.conf.eth1.mtu=1492; fi
 ip link set dev eth1 address 12:34:ff:fe:0a:bc up
 ip -6 addr add 3ffe:ffff:120::fffe:1/64  dev eth1 
 
@@ -41,11 +41,11 @@ ip link set dev eth2 mtu 1500 address 12:34:56:89:0a:bc up
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth2=eth2 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth2.autoconf=0
-if [ "$(/bin/cat /sys/class/net/eth2/mtu)" -lt 1492 ]; then ip link set dev eth2 mtu 1492; else /sbin/sysctl -q -e -w net.ipv6.conf.eth2.mtu=1492; fi
+sysctl -q -e -w net.ipv6.conf.eth2.autoconf=0
+if [ "$(cat /sys/class/net/eth2/mtu)" -lt 1492 ]; then ip link set dev eth2 mtu 1492; else sysctl -q -e -w net.ipv6.conf.eth2.mtu=1492; fi
 ip link set dev eth2 address 12:34:ff:fe:0a:bc up
 ip -6 addr add 3ffe:ffff:120::fffe:1/64  dev eth2 
 
diff --git a/tests/linux/up.19 b/tests/linux/up.19
new file mode 100644
index 0000000..e9c963f
--- /dev/null
+++ b/tests/linux/up.19
@@ -0,0 +1,43 @@
+exit code: 0
+====stdout====
+====stderr====
+
+ifup: configuring interface tunnel1=tunnel1 (inet6)
+run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
+ip -6 tunnel add tunnel1 mode ip6ip6 remote 2001:db8::2 local 2001:db8::1         encaplimit none
+ip link set tunnel1 up 
+ip -6 addr add fd00::1/48 dev tunnel1  
+
+run-parts --exit-on-error --verbose /etc/network/if-up.d
+
+ifup: configuring interface tunnel2=tunnel2 (inet6)
+run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
+ip -6 tunnel add tunnel2 mode ip6ip6 remote 2001:db8::2 local 2001:db8::1         encaplimit none
+ip link set tunnel2 up 
+ip -6 addr add fd00::1/48 dev tunnel2  
+ip -6 route add ::/0 via fd00::2  dev tunnel2 onlink 
+run-parts --exit-on-error --verbose /etc/network/if-up.d
+
+ifup: configuring interface tunnel3=tunnel3 (inet6)
+run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
+ip -6 tunnel add tunnel3 mode ipip6 remote 2001:db8::2 local 2001:db8::1         
+ip link set tunnel3 up 
+ip -4 addr add 192.0.2.1/24 dev tunnel3  
+
+run-parts --exit-on-error --verbose /etc/network/if-up.d
+
+ifup: configuring interface tunnel4=tunnel4 (inet6)
+run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
+ip -6 tunnel add tunnel4 mode ipip6 remote 2001:db8::2 local 2001:db8::1         
+ip link set tunnel4 up 
+ip -4 addr add 192.0.2.1/24 dev tunnel4  
+ip -4 route add 0.0.0.0/0 via 192.0.2.2  dev tunnel4 onlink 
+run-parts --exit-on-error --verbose /etc/network/if-up.d
+
+ifup: configuring interface tunnel5=tunnel5 (inet6)
+run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
+ip -6 tunnel add tunnel5 mode ip6gre remote 2001:db8::2 local 2001:db8::1         
+ip link set tunnel5 up 
+ip -6 addr add fd00::1/48 dev tunnel5  
+
+run-parts --exit-on-error --verbose /etc/network/if-up.d
diff --git a/tests/linux/up.3 b/tests/linux/up.3
index 41471f8..7dca6a1 100644
--- a/tests/linux/up.3
+++ b/tests/linux/up.3
@@ -11,10 +11,10 @@ ip link set dev eth0   up
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth0=eth0 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
+sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
 
 ip link set dev eth0  up
 ip -6 addr add 3ffe:ffff:100:f101::1/64  dev eth0  nodad
@@ -22,10 +22,10 @@ ip -6 addr add 3ffe:ffff:100:f101::1/64  dev eth0  nodad
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth0=eth0 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
+sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
 
 ip link set dev eth0  up
 ip -6 addr add 3ffe:ffff:100:f101::2/64  dev eth0  nodad
@@ -33,10 +33,10 @@ ip -6 addr add 3ffe:ffff:100:f101::2/64  dev eth0  nodad
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth0=eth0 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
+sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
 
 ip link set dev eth0  up
 ip -6 addr add 3ffe:ffff:100:f101::3/64  dev eth0  nodad
@@ -44,10 +44,10 @@ ip -6 addr add 3ffe:ffff:100:f101::3/64  dev eth0  nodad
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth0=eth0 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
+sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
 
 ip link set dev eth0  up
 ip -6 addr add 3ffe:ffff:100:f101::4  dev eth0  nodad
@@ -55,10 +55,10 @@ ip -6 addr add 3ffe:ffff:100:f101::4  dev eth0  nodad
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth0=eth0 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
+sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
 
 ip link set dev eth0  up
 ip -6 addr add 3ffe:ffff:100:f101::5/128  dev eth0  nodad
@@ -66,10 +66,10 @@ ip -6 addr add 3ffe:ffff:100:f101::5/128  dev eth0  nodad
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth0=eth0 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
+sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
 
 ip link set dev eth0  up
 ip -6 addr add 64  dev eth0  nodad
@@ -82,10 +82,10 @@ ifup: failed to bring up eth0
 
 ifup: configuring interface eth1=eth1 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth1.accept_ra=0
-/sbin/sysctl -q -e -w net.ipv6.conf.eth1.autoconf=0
+sysctl -q -e -w net.ipv6.conf.eth1.accept_ra=0
+sysctl -q -e -w net.ipv6.conf.eth1.autoconf=0
 
 ip addr flush dev eth1 mngtmpaddr
 ip link set dev eth1  up
@@ -94,10 +94,10 @@ ip -6 addr add 3ffe:ffff:100:f102::1/64  dev eth1  nodad
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth1=eth1 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth1.accept_ra=1
-/sbin/sysctl -q -e -w net.ipv6.conf.eth1.autoconf=0
+sysctl -q -e -w net.ipv6.conf.eth1.accept_ra=1
+sysctl -q -e -w net.ipv6.conf.eth1.autoconf=0
 
 ip link set dev eth1  up
 ip -6 addr add 3ffe:ffff:100:f102::6/64  dev eth1  nodad
diff --git a/tests/linux/up.7 b/tests/linux/up.7
index 6b636b2..0075498 100644
--- a/tests/linux/up.7
+++ b/tests/linux/up.7
@@ -11,10 +11,10 @@ ip link set dev eth0   up
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth0=eth0 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.use_tempaddr=2
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.accept_ra=0
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+sysctl -q -e -w net.ipv6.conf.eth0.use_tempaddr=2
+sysctl -q -e -w net.ipv6.conf.eth0.accept_ra=0
+sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
 
 ip addr flush dev eth0 mngtmpaddr
 ip link set dev eth0  up
@@ -30,10 +30,10 @@ ip link set dev eth0   up
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth0=eth0 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.use_tempaddr=2
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.accept_ra=0
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+sysctl -q -e -w net.ipv6.conf.eth0.use_tempaddr=2
+sysctl -q -e -w net.ipv6.conf.eth0.accept_ra=0
+sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
 
 ip addr flush dev eth0 mngtmpaddr
 ip link set dev eth0  up
@@ -44,10 +44,10 @@ if test -d /sys/class/net/eth0 &&     	! ip link show eth0.1 >/dev/null 2>&1;   
 
 ifup: configuring interface eth0.1=eth0.1 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 
 
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0/1.autoconf=0
+sysctl -q -e -w net.ipv6.conf.eth0/1.autoconf=0
 
 ip link set dev eth0.1  up
 ip -6 addr add 3ffe:ffff:120:f101::1/64  dev eth0.1  nodad
@@ -62,10 +62,10 @@ ip link set dev eth0   up
 run-parts --exit-on-error --verbose /etc/network/if-up.d
 ifup: configuring interface eth0=eth0 (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.use_tempaddr=2
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.accept_ra=0
-/sbin/sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+sysctl -q -e -w net.ipv6.conf.eth0.use_tempaddr=2
+sysctl -q -e -w net.ipv6.conf.eth0.accept_ra=0
+sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0
 
 ip addr flush dev eth0 mngtmpaddr
 ip link set dev eth0  up
@@ -99,7 +99,7 @@ run-parts --exit-on-error --verbose /etc/network/if-up.d
 
 ifup: configuring interface tunnel=tunnel (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 ip tunnel add tunnel mode sit remote any local 1.2.3.4        
 ip link set tunnel up 
 ip addr add 2002:0102:0304::1/16 dev tunnel 
diff --git a/tests/linux/up.9 b/tests/linux/up.9
index 608c2e3..e0123ec 100644
--- a/tests/linux/up.9
+++ b/tests/linux/up.9
@@ -4,7 +4,7 @@ exit code: 0
 
 ifup: configuring interface tunnel=tunnel (inet6)
 run-parts --exit-on-error --verbose /etc/network/if-pre-up.d
-/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
+modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 ip tunnel add tunnel mode sit remote any local 2.3.4.5        
 ip link set tunnel up 
 ip addr add 2002:0203:0405::1/16 dev tunnel 
diff --git a/tests/testbuild-linux b/tests/testbuild-linux
index 1181ea0..2fa1b8b 100755
--- a/tests/testbuild-linux
+++ b/tests/testbuild-linux
@@ -3,7 +3,7 @@
 dir=tests/linux
 
 result=true
-for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do
+for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
 	if [ -e $dir/testcase.$test ]; then
 		args="$(cat $dir/testcase.$test | sed -n 's/^# RUN: //p')"
 	else
diff --git a/wait-online.sh b/wait-online.sh
index dbcdaeb..c4963f7 100755
--- a/wait-online.sh
+++ b/wait-online.sh
@@ -11,7 +11,7 @@ WAIT_ONLINE_TIMEOUT=300
 case "$WAIT_ONLINE_METHOD" in
 route)
 	[ -n "$WAIT_ONLINE_ADDRESS" ] || WAIT_ONLINE_ADDRESS=default
-	(/usr/bin/timeout "$WAIT_ONLINE_TIMEOUT" ip mon r & ip -4 r s; ip -6 r s) | /bin/grep -q "^$WAIT_ONLINE_ADDRESS\>"
+	(timeout "$WAIT_ONLINE_TIMEOUT" ip mon r & ip -4 r s; ip -6 r s) | grep -q "^$WAIT_ONLINE_ADDRESS\>"
 	;;
 
 ping)
@@ -19,7 +19,7 @@ ping)
 		echo "No WAIT_ONLINE_ADDRESS specified" >&2
 		exit 1
 	fi
-	/usr/bin/timeout "$WAIT_ONLINE_TIMEOUT" /bin/sh -c 'while ! /bin/ping -q -c 1 -W 1 "'$WAIT_ONLINE_ADDRESS'" >/dev/null; do sleep 1; done'
+	timeout "$WAIT_ONLINE_TIMEOUT" sh -c 'while ! ping -q -c 1 -W 1 "'$WAIT_ONLINE_ADDRESS'" >/dev/null; do sleep 1; done'
 	;;
 
 ping6)
@@ -27,19 +27,19 @@ ping6)
 		echo "No WAIT_ONLINE_ADDRESS specified" >&2
 		exit 1
 	fi
-	/usr/bin/timeout "$WAIT_ONLINE_TIMEOUT" /bin/sh -c 'while ! /bin/ping6 -q -c 1 -W 1 "'$WAIT_ONLINE_ADDRESS'" >/dev/null; do sleep 1; done'
+	timeout "$WAIT_ONLINE_TIMEOUT" sh -c 'while ! ping6 -q -c 1 -W 1 "'$WAIT_ONLINE_ADDRESS'" >/dev/null; do sleep 1; done'
 	;;
 
 ifup|iface|interface)
 	up=false
 	if [ -z "$WAIT_ONLINE_IFACE" ]; then
-		auto_list="$(/sbin/ifquery -X lo --list)"
-		hotplug_list="$(/sbin/ifquery -X lo --allow=hotplug --list)"
+		auto_list="$(ifquery -X lo --list)"
+		hotplug_list="$(ifquery -X lo --allow=hotplug --list)"
 		if [ -n "$auto_list" ]; then
 			for i in $(seq 1 $WAIT_ONLINE_TIMEOUT); do
 				up=true
 				for iface in $auto_list; do
-					if ! /sbin/ifquery --state $iface >/dev/null; then
+					if ! ifquery --state $iface >/dev/null; then
 						up=false
 						break
 					fi
@@ -51,7 +51,7 @@ ifup|iface|interface)
 			done
 		elif [ -n "$hotplug_list" ]; then
 			for i in $(seq 1 $WAIT_ONLINE_TIMEOUT); do
-				if [ -n "$(/sbin/ifquery --state $hotplug_list)" ]; then
+				if [ -n "$(ifquery --state $hotplug_list)" ]; then
 					up=true
 					break
 				fi
@@ -62,7 +62,7 @@ ifup|iface|interface)
 		fi
 	else
 		for i in $(seq 1 $WAIT_ONLINE_TIMEOUT); do
-			if [ -n "$(/sbin/ifquery --state $WAIT_ONLINE_IFACE)" ]; then
+			if [ -n "$(ifquery --state $WAIT_ONLINE_IFACE)" ]; then
 				up=true
 				break
 			fi