Merge pull request #194 from matttbe/multiple-ifaces

 net: support multiple interfaces and different bridges

Author: arighi

virtme/commands/run.py

@@ -121,8 +121,7 @@ def make_parser() -> argparse.ArgumentParser:
         action="append",
         const="user",
         nargs="?",
-        choices=["user", "bridge", "loop"],
-        help="Enable basic network access.",
+        help="Enable basic network access: user, bridge(=<br>), loop.",
     )
     g.add_argument(
         "--balloon",
@@ -1338,8 +1337,12 @@ def do_script(shellcmd: str, ret_path=None, show_boot_console=False) -> None:
             if net == "user":
                 qemuargs.extend(["-netdev", "user,id=n%d" % index])
                 extend_dhcp = True
-            elif net == "bridge":
-                qemuargs.extend(["-netdev", "bridge,id=n%d,br=virbr0" % index])
+            elif net == "bridge" or net.startswith("bridge="):
+                if len(net) > 7 and net[6] == '=':
+                    bridge = net[7:]
+                else:
+                    bridge = "virbr0"
+                qemuargs.extend(["-netdev", "bridge,id=n%d,br=%s" % (index, bridge)])
                 extend_dhcp = True
             elif net == "loop":
                 hubid = index
@@ -1348,7 +1351,7 @@ def do_script(shellcmd: str, ret_path=None, show_boot_console=False) -> None:
                 qemuargs.extend(["-device", "%s,netdev=n%d" % (arch.virtio_dev_type("net"), index)])
                 qemuargs.extend(["-netdev", "hubport,id=n%d,hubid=%d" % (index, hubid)])
             else:
-                assert False
+                arg_fail("--net: invalid choice: '%s' (choose from user, bridge(=<br>), loop)" % net)
             index += 1
         if extend_dhcp:
             kernelargs.extend(["virtme.dhcp"])

virtme/guest/virtme-init

@@ -252,8 +252,11 @@ mount --bind "$tmpfile" "$real_sudoers"
 
 if cat /proc/cmdline |grep -q -E '(^| )virtme.dhcp($| )'; then
     # udev is liable to rename the interface out from under us.
-    virtme_net=`ls "$(ls -d /sys/bus/virtio/drivers/virtio_net/virtio* |sort -g |head -n1)"/net`
-    busybox udhcpc -i "$virtme_net" -n -q -f -s "$(dirname $0)/virtme-udhcpc-script"
+    for d in /sys/bus/virtio/drivers/virtio_net/virtio*/net/*; do
+        virtme_net=$(basename "${d}")
+        busybox udhcpc -i "$virtme_net" -n -q -f -s "$(dirname $0)/virtme-udhcpc-script" &
+    done
+    wait
 fi
 
 if cat /proc/cmdline |grep -q -E '(^| )virtme.snapd($| )'; then

virtme/guest/virtme-udhcpc-script

@@ -10,7 +10,9 @@ if [[ "$1" == "deconfig" ]]; then
     ip addr flush dev "$interface"
 elif [[ "$1" == "bound" ]]; then
     ip addr add "$ip/$mask" dev "$interface"
-    ip route add default via "$router" dev "$interface"
+    if [[ -n "$router" ]]; then
+        ip route add default via "$router" dev "$interface"
+    fi
     if [[ -n "$dns" ]]; then
 	# A lot of systems will have /etc/resolv.conf symlinked to
 	# /run/NetworkManager/something_or_other. Debian symlinks to /run/resolvconf.

virtme_ng/run.py

@@ -349,8 +349,7 @@ def make_parser():
         "--network",
         "-n",
         action="append",
-        choices=['user', 'bridge', 'loop'],
-        help="Enable network access",
+        help="Enable network access: user, bridge(=<br>), loop",
     )
 
     parser.add_argument(