From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 15 Sep 2018 14:58:16 +0000 (+0100)
Subject: nitsi: Rename make-install include file to setup
X-Git-Url: http://git.ipfire.org/?p=people%2Fjschlag%2Fnetwork.git;a=commitdiff_plain;h=fb99a6c73d45004e422e71040c007b8de0cbd0f6

nitsi: Rename make-install include file to setup

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 2e073b6..786442c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -586,13 +586,13 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \
 	https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/
 
 NITSI_INCLUDE_RECIPES = \
-	test/nitsi/include/make-install
+	test/nitsi/include/setup
 
 EXTRA_DIST += \
-	test/nitsi/include/make-install.in
+	test/nitsi/include/setup.in
 
 CLEANFILES += \
-	test/nitsi/include/make-install
+	test/nitsi/include/setup
 
 NITSI_TESTS = \
 	test/nitsi/test/hello-world \
diff --git a/test/nitsi/include/.gitignore b/test/nitsi/include/.gitignore
index 3a75134..146f275 100644
--- a/test/nitsi/include/.gitignore
+++ b/test/nitsi/include/.gitignore
@@ -1 +1 @@
-make-install
+setup
diff --git a/test/nitsi/include/make-install.in b/test/nitsi/include/setup.in
similarity index 100%
rename from test/nitsi/include/make-install.in
rename to test/nitsi/include/setup.in
diff --git a/test/nitsi/include/vpn-base b/test/nitsi/include/vpn-base
index 4e62763..44825db 100644
--- a/test/nitsi/include/vpn-base
+++ b/test/nitsi/include/vpn-base
@@ -1,5 +1,5 @@
 # This contains the basic network configuration for all vpn-tests
-include: ../include/make-install
+include: ../include/setup
 include: ../include/alice-port-vars
 include: ../include/bob-port-vars
 all: network zone new upl0 bridge
diff --git a/test/nitsi/test/raw-device-get-by-mac/recipe b/test/nitsi/test/raw-device-get-by-mac/recipe
index e22454e..61ea1fb 100644
--- a/test/nitsi/test/raw-device-get-by-mac/recipe
+++ b/test/nitsi/test/raw-device-get-by-mac/recipe
@@ -1,6 +1,4 @@
-include: ../../include/make-install
-include: ../../include/network-settings
-include: ../../include/network-reset
+include: ../../include/setup
 alice: port="$(network raw device-get-by-mac-address "52:54:00:8a:b8:b5")"
 alice: echo $port
 alice: [ "52:54:00:8a:b8:b5" = "$(cat /sys/class/net/${port}/address)" ]
diff --git a/test/nitsi/test/zone-new-bridge/recipe b/test/nitsi/test/zone-new-bridge/recipe
index 01faf6c..a1ae180 100644
--- a/test/nitsi/test/zone-new-bridge/recipe
+++ b/test/nitsi/test/zone-new-bridge/recipe
@@ -1,4 +1,4 @@
-include: ../../include/make-install
+include: ../../include/setup
 
 alice: network zone new upl0 bridge
 # this returns zero if the device exists
diff --git a/test/nitsi/test/zone-port-attach-bridge/recipe b/test/nitsi/test/zone-port-attach-bridge/recipe
index 2edba5d..3abf294 100644
--- a/test/nitsi/test/zone-port-attach-bridge/recipe
+++ b/test/nitsi/test/zone-port-attach-bridge/recipe
@@ -1,4 +1,4 @@
-include: ../../include/make-install
+include: ../../include/setup
 
 alice: network zone new upl0 bridge
 # Create a dummy port we can attach to upl0