summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to '')
-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.txt2
-rw-r--r--share/man/container-create-debconf.1.txt2
-rwxr-xr-xshare/scripts/debconf10
4 files changed, 7 insertions, 7 deletions
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