Merge branch 'danimo-remove-test-dependencies'

README.testsuite

@@ -1,6 +1,5 @@
 For the testsuite to work, you will have to install at least the following software packages:
 dash \
-bridge-utils \
 asciidoc \
 mdadm \
 lvm2 \
@@ -11,13 +10,11 @@ nbd \
 dhcp-server \
 scsi-target-utils \
 iscsi-initiator-utils \
-net-tools \
 strace \
 syslinux \
 python-imgcreate \
 genisoimage \
 btrfs-progs \
-bridge-utils \
 kmod-devel \
 gcc \
 bzip2 \

modules.d/40network/ifup.sh

@@ -185,11 +185,11 @@ if [ -z "$NO_BRIDGE_MASTER" ]; then
             NO_BRIDGE_MASTER=yes NO_AUTO_DHCP=yes ifup $ethname
             linkup $ethname
             if [ ! -e /tmp/bridge.$bridgename.up ]; then
-                brctl addbr $bridgename
+                ip link add name $bridgename type bridge
-                brctl setfd $bridgename 0
+                echo 0 > /sys/devices/virtual/net/$bridgename/bridge/forward_delay
                 > /tmp/bridge.$bridgename.up
             fi
-            brctl addif $bridgename $ethname
+            ip link set dev $ethname master $bridgename
             ifup $bridgename
             exit 0
         done

modules.d/40network/module-setup.sh

@@ -27,7 +27,6 @@ install() {
     inst_multiple ip dhclient sed awk
     inst_multiple -o arping arping2
     inst_multiple -o ping ping6
-    inst_multiple -o brctl
     inst_multiple -o teamd teamdctl teamnl
     inst_simple /etc/libnl/classid
     inst_script "$moddir/ifup.sh" "/sbin/ifup"

test/TEST-01-BASIC/test.sh

@@ -39,8 +39,8 @@ test_setup() {
                 ln -sfnr usr/$i $i
             done
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
+	    mount dmesg dhclient mkdir cp ping dhclient \
 	    umount strace less setsid
 	for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             [ -f ${_terminfodir}/l/linux ] && break

test/TEST-02-SYSTEMD/test.sh

@@ -36,8 +36,8 @@ test_setup() {
             done
             mkdir -p -- var/lib/nfs/rpc_pipefs
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
+	    mount dmesg dhclient mkdir cp ping dhclient \
 	    umount strace less setsid
 	for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             [ -f ${_terminfodir}/l/linux ] && break

test/TEST-03-USR-MOUNT/test.sh

@@ -66,8 +66,8 @@ test_setup() {
                 ln -sfnr usr/$i $i
             done
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
+	    mount dmesg dhclient mkdir cp ping dhclient \
 	    umount strace less setsid
 	for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             [ -f ${_terminfodir}/l/linux ] && break

test/TEST-04-FULL-SYSTEMD/test.sh

@@ -71,8 +71,8 @@ test_setup() {
         ln -sfn /run "$initdir/var/run"
         ln -sfn /run/lock "$initdir/var/lock"
 
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
+	    mount dmesg dhclient mkdir cp ping dhclient \
 	    umount strace less setsid tree systemctl reset
 
 	for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do

test/TEST-10-RAID/test.sh

@@ -37,8 +37,8 @@ test_setup() {
                 ln -sfnr usr/$i $i
             done
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
+	    mount dmesg dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done

test/TEST-11-LVM/test.sh

@@ -35,8 +35,8 @@ test_setup() {
             done
             mkdir -p -- var/lib/nfs/rpc_pipefs
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
+	    mount dmesg dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done

test/TEST-12-RAID-DEG/test.sh

@@ -76,8 +76,8 @@ test_setup() {
                 ln -sfnr usr/$i $i
             done
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
+	    mount dmesg dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done

test/TEST-13-ENC-RAID-LVM/test.sh

@@ -75,8 +75,8 @@ test_setup() {
             done
             mkdir -p -- var/lib/nfs/rpc_pipefs
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
+	    mount dmesg dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done

test/TEST-14-IMSM/test.sh

@@ -64,8 +64,8 @@ test_setup() {
                 ln -sfnr usr/$i $i
             done
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
+	    mount dmesg dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done

test/TEST-15-BTRFSRAID/test.sh

@@ -37,8 +37,8 @@ test_setup() {
             done
             mkdir -p -- var/lib/nfs/rpc_pipefs
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
+	    mount dmesg dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done

test/TEST-16-DMSQUASH/test.sh

@@ -71,8 +71,8 @@ test_setup() {
                 ln -sfnr usr/$i $i
             done
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
+	    mount dmesg dhclient mkdir cp ping dhclient \
 	    umount strace less
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
 	    [[ -f ${_terminfodir}/l/linux ]] && break

test/TEST-17-LVM-THIN/test.sh

@@ -35,8 +35,8 @@ test_setup() {
             done
             mkdir -p -- var/lib/nfs/rpc_pipefs
         )
-	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
+	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
-	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
+	    mount dmesg dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done