From b71a3b319fa347157973e45e4e08f407e2cb5d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sp=C3=B6hel?=
 <simon.spoehel@open-infrastructure.net>
Date: Sun, 9 Jul 2017 15:52:29 +0200
Subject: Making container-tools use nspawn files.

---
 share/config/container.conf.in   | 28 ----------------------------
 share/config/container.nspawn.in | 36 ++++++++++++++++++++++++++++++++++++
 share/scripts/debconf            |  8 ++++----
 3 files changed, 40 insertions(+), 32 deletions(-)
 delete mode 100644 share/config/container.conf.in
 create mode 100644 share/config/container.nspawn.in

(limited to 'share')

diff --git a/share/config/container.conf.in b/share/config/container.conf.in
deleted file mode 100644
index 322e2c9..0000000
--- a/share/config/container.conf.in
+++ /dev/null
@@ -1,28 +0,0 @@
-# container-tools: @NAME@
-
-[start]
-cnt.auto=@CNT_AUTO@
-cnt.container-server=@CNT_CONTAINER_SERVER@
-cnt.network-bridge=@CNT_NETWORK_BRIDGE@
-cnt.overlay=@CNT_OVERLAY@
-bind=@BIND@
-bind-ro=@BIND_RO@
-boot=@BOOT@
-capability=@CAPABILITY@
-directory=@DIRECTORY@
-drop-capability=@DROP_CAPABILITY@
-link-journal=@LINK_JOURNAL@
-machine=@MACHINE@
-network-veth-extra=@NETWORK_VETH_EXTRA@
-private-users=@PRIVATE_USERS@
-register=@REGISTER@
-
-[limit]
-BlockIODeviceWeight=
-BlockIOReadBandwidth=
-BlockIOWeight=
-BlockIOWriteBandwidth=
-CPUQuota=
-CPUShares=
-MemoryLimit=
-TasksMax=
diff --git a/share/config/container.nspawn.in b/share/config/container.nspawn.in
new file mode 100644
index 0000000..774df95
--- /dev/null
+++ b/share/config/container.nspawn.in
@@ -0,0 +1,36 @@
+# systemd-nspawn @NAME@
+
+[Exec]
+Boot=@BOOT@
+Capability=@CAPABILITY@
+DropCapability=@DROP_CAPABILITY@
+PrivateUsers=@PRIVATE_USERS@
+
+[Files]
+Bind=@BIND@
+BindReadOnly=@BIND_RO@
+Overlay=@CNT_OVERLAY@
+
+[Network]
+VirtualEthernetExtra=
+
+# open-infrastructure-container-tools extension
+[ContainerToolsStart]
+cnt.auto=@CNT_AUTO@
+cnt.container-server=@CNT_CONTAINER_SERVER@
+cnt.network-bridge=@CNT_NETWORK_BRIDGE@
+directory=@DIRECTORY@
+link-journal=@LINK_JOURNAL@
+machine=@MACHINE@
+network-veth-extra=@NETWORK_VETH_EXTRA@
+register=@REGISTER@
+
+[ContainerToolsLimit]
+BlockIODeviceWeight=
+BlockIOReadBandwidth=
+BlockIOWeight=
+BlockIOWriteBandwidth=
+CPUQuota=
+CPUShares=
+MemoryLimit=
+TasksMax=
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 38bf937..9e74662 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -20,7 +20,7 @@ set -e
 
 SCRIPT="${0}"
 
-CONFIG="/etc/container-tools/config"
+CONFIG="/etc/systemd/nspawn"
 HOOKS="/etc/container-tools/hooks"
 MACHINES="/var/lib/machines"
 
@@ -937,7 +937,7 @@ Commands ()
 		-e "s|^bind=.*|bind=${BIND}|g" \
 		-e "s|^bind-ro=.*|bind-ro=${BIND_RO}|g" \
 		-e "s|^network-veth-extra=.*|network-veth-extra=${HOST_INTERFACE_NAME}:eth0|g" \
-	"${CONFIG}/${NAME}.conf"
+	"${CONFIG}/${NAME}.nspawn"
 
 	for NUMBER in $(seq 1 ${NETWORK_NUMBER})
 	do
@@ -953,10 +953,10 @@ Commands ()
 		HOST_INTERFACE_NAME="$(echo ${HOST_INTERFACE_NAME:-veth-${HOSTNAME_SHORT}-${NUMBER}})"
 		CONTAINER_INTERFACE_NAME="eth${NUMBER}"
 
-		sed -i -e "/^register=.*/ a network-veth-extra=${HOST_INTERFACE_NAME}:${CONTAINER_INTERFACE_NAME}" "${CONFIG}/${NAME}.conf"
+		sed -i -e "/^register=.*/ a network-veth-extra=${HOST_INTERFACE_NAME}:${CONTAINER_INTERFACE_NAME}" "${CONFIG}/${NAME}.nspawn"
 
 		eval BRIDGE="$`echo NETWORK${NUMBER}_BRIDGE`"
-		sed -i -e "/^register=.*/ a cnt.network-bridge=${HOST_INTERFACE_NAME}:${BRIDGE:-br${NUMBER}}" "${CONFIG}/${NAME}.conf"
+		sed -i -e "/^register=.*/ a cnt.network-bridge=${HOST_INTERFACE_NAME}:${BRIDGE:-br${NUMBER}}" "${CONFIG}/${NAME}.nspawn"
 	done
 
 	# Setting root password
-- 
cgit v1.2.3