From 198710f9359e09bbb47ef966c671bf686e6989e5 Mon Sep 17 00:00:00 2001
From: Nik Lutz <nik@netstyle.ch>
Date: Wed, 18 May 2016 10:49:29 +0200
Subject: Using systemd to cleanup network interfaces after the container has
 been stopped.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 lib/container/stop | 61 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 22 deletions(-)

(limited to 'lib/container')

diff --git a/lib/container/stop b/lib/container/stop
index 18d154c..67cc403 100755
--- a/lib/container/stop
+++ b/lib/container/stop
@@ -23,9 +23,11 @@ COMMAND="$(basename ${0})"
 CONFIG="/etc/container-tools/config"
 MACHINES="/var/lib/machines"
 
+CLEAN="false"
+
 Parameters ()
 {
-	LONG_OPTIONS="name:,force"
+	LONG_OPTIONS="name:,force,clean"
 	OPTIONS="n:,f"
 
 	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
@@ -50,6 +52,12 @@ Parameters ()
 				FORCE="true"
 				;;
 
+			--clean)
+				# internal option
+				CLEAN="true"
+				shift 1
+				;;
+
 			--)
 				shift 1
 				break
@@ -84,6 +92,36 @@ fi
 
 STATE="$(machinectl show ${NAME} 2>&1 | awk -F= '/^State=/ { print $2 }')"
 
+# Removing network configuration
+case "${CLEAN}" in
+	true)
+		NETWORK_VETH_EXTRA_CONF="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+
+		case "${NETWORK_VETH_EXTRA_CONF}" in
+			"")
+				;;
+
+			*)
+				for VETH in ${NETWORK_VETH_EXTRA_CONF}
+				do
+					INTERFACE="$(echo ${VETH} | awk -F: '{ print $1 }')"
+					FILE="/etc/network/interfaces.d/${INTERFACE}"
+
+					if [ -f "${FILE}" ]
+					then
+						rm -f "${FILE}"
+					fi
+				done
+				;;
+		esac
+
+		exit 0
+		;;
+
+	*)
+		;;
+esac
+
 case "${STATE}" in
 	running)
 		;;
@@ -106,24 +144,3 @@ esac
 
 # Run
 machinectl ${MODE} ${NAME}
-
-# Removing network configuration
-NETWORK_VETH_EXTRA_CONF="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-case "${NETWORK_VETH_EXTRA_CONF}" in
-	"")
-		;;
-
-	*)
-		for VETH in ${NETWORK_VETH_EXTRA_CONF}
-		do
-			INTERFACE="$(echo ${VETH} | awk -F: '{ print $1 }')"
-			FILE="/etc/network/interfaces.d/${INTERFACE}"
-
-			if [ -f "${FILE}"]
-			then
-				rm -f "${FILE}"
-			fi
-		done
-	;;
-esac
-- 
cgit v1.2.3