diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | lib/container/auto | 6 | ||||
| -rwxr-xr-x | lib/container/create | 8 | ||||
| -rwxr-xr-x | lib/container/list | 6 | ||||
| -rwxr-xr-x | lib/container/move | 10 | ||||
| -rwxr-xr-x | lib/container/remove | 12 | ||||
| -rwxr-xr-x | lib/container/start | 44 | ||||
| -rwxr-xr-x | lib/container/status | 2 | ||||
| -rwxr-xr-x | lib/container/stop | 10 | ||||
| -rw-r--r-- | share/config/container.nspawn.in (renamed from share/config/container.conf.in) | 0 | ||||
| -rw-r--r-- | share/man/container-create-curl.1.txt | 2 | ||||
| -rw-r--r-- | share/man/container-create-debconf.1.txt | 2 | ||||
| -rwxr-xr-x | share/scripts/debconf | 10 |
13 files changed, 56 insertions, 58 deletions
@@ -57,7 +57,6 @@ build: share/man/*.txt sed -n '/^NAME/,$$p' share/man/$(SOFTWARE).7.txt > README.txt install: build - mkdir -p $(DESTDIR)/etc/${SOFTWARE}/config mkdir -p $(DESTDIR)/etc/${SOFTWARE}/debconf mkdir -p $(DESTDIR)/etc/${SOFTWARE}/hooks @@ -177,7 +176,6 @@ uninstall: done rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/bin || true - rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE}/config || true rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE}/debconf || true rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE}/hooks || true rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE} || true diff --git a/lib/container/auto b/lib/container/auto index 8477915..85f97a8 100755 --- a/lib/container/auto +++ b/lib/container/auto @@ -22,7 +22,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" Parameters () @@ -104,7 +104,7 @@ case "${FORCE}" in ;; esac -for FILE in "${CONFIG}"/*.conf +for FILE in "${CONFIG}"/*.nspawn do if grep -Eqs "^ *cnt.auto=force-true" "${FILE}" then @@ -113,7 +113,7 @@ do if grep -Eqs "^ *cnt.auto=(force-true|true)" "${FILE}" && grep -Eqs "^ *cnt.container-server=${HOST}" "${FILE}" then - CONTAINER="$(basename ${FILE} .conf)" + CONTAINER="$(basename ${FILE} .nspawn)" cnt ${ACTION} -n ${CONTAINER} ${OPTIONS} || true fi diff --git a/lib/container/create b/lib/container/create index 2ffcfda..767a8c6 100755 --- a/lib/container/create +++ b/lib/container/create @@ -22,7 +22,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" MACHINES="/var/lib/machines" SCRIPTS="/usr/share/container-tools/scripts" @@ -121,9 +121,9 @@ then Usage fi -if [ -e "${CONFIG}/${NAME}.conf" ] +if [ -e "${CONFIG}/${NAME}.nspawn" ] then - echo "'${NAME}': container already exists or ${CONFIG}/${NAME}.conf has not been removed" >&2 + echo "'${NAME}': container already exists or ${CONFIG}/${NAME}.nspawn has not been removed" >&2 exit 1 fi @@ -244,7 +244,7 @@ sed -e "s|@CNT_AUTO@|${CNT_AUTO}|g" \ -e "s|@NETWORK_VETH_EXTRA@|${NETWORK_VETH_EXTRA}|g" \ -e "s|@PRIVATE_USERS@|no|g" \ -e "s|@REGISTER@|yes|g" \ -/usr/share/container-tools/config/container.conf.in > "${CONFIG}/${NAME}.conf" +/usr/share/container-tools/config/container.nspawn.in > "${CONFIG}/${NAME}.nspawn" # Run "${SCRIPTS}/${SCRIPT}" $(echo "${@}" | sed -e 's| -- | |') diff --git a/lib/container/list b/lib/container/list index 6fa9eed..6d1efda 100755 --- a/lib/container/list +++ b/lib/container/list @@ -22,7 +22,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" MACHINES="/var/lib/machines" @@ -329,9 +329,9 @@ for CONTAINER in ${CONTAINERS} do STATE="$(machinectl show ${CONTAINER} 2>&1 | awk -F= '/^State=/ { print $2 }')" - if [ -e "${CONFIG}/${CONTAINER}.conf" ] + if [ -e "${CONFIG}/${CONTAINER}.nspawn" ] then - CONTAINER_SERVER="$(awk -F= '/^cnt.container-server=/ { print $2 }' ${CONFIG}/${CONTAINER}.conf)" + CONTAINER_SERVER="$(awk -F= '/^cnt.container-server=/ { print $2 }' ${CONFIG}/${CONTAINER}.nspawn)" CONTAINER_SERVER="${CONTAINER_SERVER:-false}" case "${CONTAINER_SERVER}" in diff --git a/lib/container/move b/lib/container/move index e533b0e..d9f60e1 100755 --- a/lib/container/move +++ b/lib/container/move @@ -22,7 +22,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" MACHINES="/var/lib/machines" @@ -140,11 +140,11 @@ do done # Run -mv "${CONFIG}/${OLD}.conf" "${CONFIG}/${NEW}.conf" +mv "${CONFIG}/${OLD}.nspawn" "${CONFIG}/${NEW}.nspawn" mv "${MACHINES}/${OLD}" "${MACHINES}/${NEW}" # rw bind mounts -BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)" +BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BIND}" ] then @@ -171,7 +171,7 @@ then fi # ro bind mounts -BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)" +BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BIND_RO}" ] then @@ -198,7 +198,7 @@ then fi # config -sed -i -e "s|${OLD}|${NEW}|g" "${CONFIG}/${NEW}.conf" +sed -i -e "s|${OLD}|${NEW}|g" "${CONFIG}/${NEW}.nspawn" # Post hooks for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}" diff --git a/lib/container/remove b/lib/container/remove index e8dd653..8ce87bb 100755 --- a/lib/container/remove +++ b/lib/container/remove @@ -22,7 +22,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" MACHINES="/var/lib/machines" @@ -111,7 +111,7 @@ then Usage fi -if [ ! -e "${MACHINES}/${NAME}" ] && [ ! -e "${CONFIG}/${NAME}.conf" ] +if [ ! -e "${MACHINES}/${NAME}" ] && [ ! -e "${CONFIG}/${NAME}.nspawn" ] then echo "'${NAME}': no such container" >&2 exit 1 @@ -176,10 +176,10 @@ do done # data -if [ -e "${CONFIG}/${NAME}.conf" ] +if [ -e "${CONFIG}/${NAME}.nspawn" ] then # Removing rw bind mounts - BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BIND}" ] then @@ -194,7 +194,7 @@ then fi # Removing ro bind mounts - BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BIND_RO}" ] then @@ -211,7 +211,7 @@ fi # Run rm --preserve-root --one-file-system -rf ${RM_OPTIONS} "${MACHINES}/${NAME}" -rm -f ${RM_OPTIONS} "${CONFIG}/${NAME}.conf" +rm -f ${RM_OPTIONS} "${CONFIG}/${NAME}.nspawn" # Post hooks for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}" diff --git a/lib/container/start b/lib/container/start index e4b2ee6..6d43af8 100755 --- a/lib/container/start +++ b/lib/container/start @@ -22,7 +22,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" MACHINES="/var/lib/machines" @@ -175,9 +175,9 @@ case "${START}" in esac # config -if [ -e "${CONFIG}/${NAME}.conf" ] +if [ -e "${CONFIG}/${NAME}.nspawn" ] then - CNT_OVERLAY="$(awk -F= '/^cnt.overlay=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + CNT_OVERLAY="$(awk -F= '/^cnt.overlay=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${CNT_OVERLAY}" ] then @@ -202,7 +202,7 @@ then done fi - BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BIND}" ] then @@ -227,7 +227,7 @@ then done fi - BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BIND_RO}" ] then @@ -252,7 +252,7 @@ then done fi - BOOT="$(awk -F= '/^boot=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo yes)" + BOOT="$(awk -F= '/^boot=/ { print $2 }' ${CONFIG}/${NAME}.nspawn || echo yes)" case "${BOOT}" in yes) @@ -264,7 +264,7 @@ then ;; esac - CAPABILITY="$(awk -F= '/^capability=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + CAPABILITY="$(awk -F= '/^capability=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" case "${CAPABILITY}" in "") @@ -276,10 +276,10 @@ then ;; esac - DIRECTORY="$(awk -F= '/^directory=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo ${MACHINES}/${NAMES})" + DIRECTORY="$(awk -F= '/^directory=/ { print $2 }' ${CONFIG}/${NAME}.nspawn || echo ${MACHINES}/${NAMES})" DIRECTORY="--directory ${DIRECTORY}" - DROP_CAPABILITY="$(awk -F= '/^drop-capability=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + DROP_CAPABILITY="$(awk -F= '/^drop-capability=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" case "${DROP_CAPABILITY}" in "") @@ -291,7 +291,7 @@ then ;; esac - LINK_JOURNAL="$(awk -F= '/^link-journal=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo no)" + LINK_JOURNAL="$(awk -F= '/^link-journal=/ { print $2 }' ${CONFIG}/${NAME}.nspawn || echo no)" case "${LINK_JOURNAL}" in yes) @@ -307,7 +307,7 @@ then NETWORK_VETH_EXTRA="" - VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" case "${VETHS}" in "") @@ -327,7 +327,7 @@ then ;; esac - NETWORK_BRIDGES="$(awk -F= '/^cnt.network-bridge=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + NETWORK_BRIDGES="$(awk -F= '/^cnt.network-bridge=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" case "${NETWORK_BRIDGES}" in "") @@ -363,7 +363,7 @@ EOF ;; esac - PRIVATE_USERS="$(awk -F= '/^private-users=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo no)" + PRIVATE_USERS="$(awk -F= '/^private-users=/ { print $2 }' ${CONFIG}/${NAME}.nspawn || echo no)" case "${PRIVATE_USERS}" in yes) @@ -375,7 +375,7 @@ EOF ;; esac - REGISTER="$(awk -F= '/^register=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo yes)" + REGISTER="$(awk -F= '/^register=/ { print $2 }' ${CONFIG}/${NAME}.nspawn || echo yes)" case "${REGISTER}" in yes) @@ -387,7 +387,7 @@ EOF ;; esac - BLOCK_IO_DEVICE_WEIGHT="$(awk -F= '/^BlockIODeviceWeight=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BLOCK_IO_DEVICE_WEIGHT="$(awk -F= '/^BlockIODeviceWeight=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BLOCK_IO_DEVICE_WEIGHT}" ] then @@ -395,7 +395,7 @@ EOF SET_PROPERTY="true" fi - BLOCK_IO_READ_BANDWIDTH="$(awk -F= '/^BlockIOReadBandwidth=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BLOCK_IO_READ_BANDWIDTH="$(awk -F= '/^BlockIOReadBandwidth=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BLOCK_IO_READ_BANDWIDTH}" ] then @@ -403,7 +403,7 @@ EOF SET_PROPERTY="true" fi - BLOCK_IO_WEIGHT="$(awk -F= '/^BlockIOWeight=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BLOCK_IO_WEIGHT="$(awk -F= '/^BlockIOWeight=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BLOCK_IO_WEIGHT}" ] then @@ -411,7 +411,7 @@ EOF SET_PROPERTY="true" fi - BLOCK_IO_WRITE_BANDWIDTH="$(awk -F= '/^BlockIOWriteBandwidth=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BLOCK_IO_WRITE_BANDWIDTH="$(awk -F= '/^BlockIOWriteBandwidth=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BLOCK_IO_WRITE_BANDWIDTH}" ] then @@ -419,7 +419,7 @@ EOF SET_PROPERTY="true" fi - CPU_QUOTA="$(awk -F= '/^CPUQuota=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + CPU_QUOTA="$(awk -F= '/^CPUQuota=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${CPU_QUOTA}" ] then @@ -427,7 +427,7 @@ EOF SET_PROPERTY="true" fi - CPU_SHARES="$(awk -F= '/^CPUShares=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + CPU_SHARES="$(awk -F= '/^CPUShares=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${CPU_SHARES}" ] then @@ -435,7 +435,7 @@ EOF SET_PROPERTY="true" fi - MEMORY_LIMIT="$(awk -F= '/^MemoryLimit=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + MEMORY_LIMIT="$(awk -F= '/^MemoryLimit=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${MEMORY_LIMIT}" ] then @@ -443,7 +443,7 @@ EOF SET_PROPERTY="true" fi - TASKS_MAX="$(awk -F= '/^TasksMax=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + TASKS_MAX="$(awk -F= '/^TasksMax=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${TASKS_MAX}" ] then diff --git a/lib/container/status b/lib/container/status index 9c5ab20..32dd928 100755 --- a/lib/container/status +++ b/lib/container/status @@ -22,7 +22,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" MACHINES="/var/lib/machines" diff --git a/lib/container/stop b/lib/container/stop index 5099005..514e098 100755 --- a/lib/container/stop +++ b/lib/container/stop @@ -22,7 +22,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" MACHINES="/var/lib/machines" @@ -128,7 +128,7 @@ STATE="$(machinectl show ${NAME} 2>&1 | awk -F= '/^State=/ { print $2 }')" case "${CLEAN}" in true) # Removing overlay mounts - CNT_OVERLAY="$(awk -F= '/^cnt.overlay=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + CNT_OVERLAY="$(awk -F= '/^cnt.overlay=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${CNT_OVERLAY}" ] then @@ -148,7 +148,7 @@ case "${CLEAN}" in fi # Removing rw bind mounts - BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BIND}" ] then @@ -163,7 +163,7 @@ case "${CLEAN}" in fi # Removing ro bind mounts - BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BIND_RO}" ] then @@ -178,7 +178,7 @@ case "${CLEAN}" in fi # Removing network configuration - VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" case "${VETHS}" in "") diff --git a/share/config/container.conf.in b/share/config/container.nspawn.in index 322e2c9..322e2c9 100644 --- a/share/config/container.conf.in +++ b/share/config/container.nspawn.in diff --git a/share/man/container-create-curl.1.txt b/share/man/container-create-curl.1.txt index 543a261..131da46 100644 --- a/share/man/container-create-curl.1.txt +++ b/share/man/container-create-curl.1.txt @@ -84,7 +84,7 @@ FILES ----- The following files are used: -*/etc/container-tools/config*:: +*/etc/systemd/nspawn*:: Container configuration files. */usr/share/container-tools/scripts*:: diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt index db4028b..f9c7dd7 100644 --- a/share/man/container-create-debconf.1.txt +++ b/share/man/container-create-debconf.1.txt @@ -113,7 +113,7 @@ FILES ----- The following files are used: -*/etc/container-tools/config*:: +*/etc/systemd/nspawn*:: Container configuration files. */usr/share/container-tools/scripts*:: diff --git a/share/scripts/debconf b/share/scripts/debconf index 77a974a..8635b8e 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -23,7 +23,7 @@ set -e SCRIPT="${0}" export SCRIPT -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" MACHINES="/var/lib/machines" @@ -447,7 +447,7 @@ EOF cp "${DIRECTORY}/usr/share/sysvinit/inittab" "${DIRECTORY}/etc/inittab" fi - # Removing resolv.conf + # Removing resolvc.conf #rm -f "${DIRECTORY}/etc/resolv.conf" # FIXME: needs to stay for the moment rm -f "${DIRECTORY}/etc/resolv.conf" @@ -948,7 +948,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}:eno1|g" \ - "${CONFIG}/${NAME}.conf" + "${CONFIG}/${NAME}.nspawn" if [ "${NETWORK_NUMBER}" -ge 2 ] then @@ -966,10 +966,10 @@ Commands () HOST_INTERFACE_NAME="$(echo ${HOST_INTERFACE_NAME:-veth-${HOSTNAME_SHORT}-${NUMBER}})" CONTAINER_INTERFACE_NAME="eno${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:-bridge${NUMBER}}" "${CONFIG}/${NAME}.conf" + sed -i -e "/^register=.*/ a cnt.network-bridge=${HOST_INTERFACE_NAME}:${BRIDGE:-bridge${NUMBER}}" "${CONFIG}/${NAME}.nspawn" done fi |