summary refs log tree commit diff
path: root/host/start-vm
diff options
context:
space:
mode:
Diffstat (limited to 'host/start-vm')
-rw-r--r--host/start-vm/tests/bridge_add_if.c6
-rw-r--r--host/start-vm/tests/bridge_remove_if.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/host/start-vm/tests/bridge_add_if.c b/host/start-vm/tests/bridge_add_if.c
index adc9e59..4ca6809 100644
--- a/host/start-vm/tests/bridge_add_if.c
+++ b/host/start-vm/tests/bridge_add_if.c
@@ -19,8 +19,10 @@ int main(void)
 	int r, tap;
 	struct stat statbuf;
 
-	if (!unshare(CLONE_NEWUSER|CLONE_NEWNET|CLONE_NEWNS))
-		assert(!mount("sysfs", "/sys", "sysfs", 0, NULL));
+	if (!unshare(CLONE_NEWUSER|CLONE_NEWNET|CLONE_NEWNS)) {
+		if (mount("sysfs", "/sys", "sysfs", 0, NULL) == -1)
+			return errno == ENOENT ? 77 : 1;
+	}
 
 	tap = tap_open(tap_name, 0);
 	if (tap == -1)
diff --git a/host/start-vm/tests/bridge_remove_if.c b/host/start-vm/tests/bridge_remove_if.c
index ff66094..5ce61bd 100644
--- a/host/start-vm/tests/bridge_remove_if.c
+++ b/host/start-vm/tests/bridge_remove_if.c
@@ -19,8 +19,10 @@ int main(void)
 	int r, tap;
 	struct stat statbuf;
 
-	if (!unshare(CLONE_NEWUSER|CLONE_NEWNET|CLONE_NEWNS))
-		assert(!mount("sysfs", "/sys", "sysfs", 0, NULL));
+	if (!unshare(CLONE_NEWUSER|CLONE_NEWNET|CLONE_NEWNS)) {
+		if (mount("sysfs", "/sys", "sysfs", 0, NULL) == -1)
+			return errno == ENOENT ? 77 : 1;
+	}
 
 	tap = tap_open(tap_name, 0);
 	if (tap == -1)