summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-06-20 18:38:53 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-07-01 09:31:11 +0000
commita09ee3f6b885b2b85986e10768f0b3088eb88f4b (patch)
tree0dc1f5805b9f3dfac6aceb3813910745790d9717
parentAdding section about known limitations to container-tools manpage. (diff)
downloadcompute-tools-a09ee3f6b885b2b85986e10768f0b3088eb88f4b.tar.xz
compute-tools-a09ee3f6b885b2b85986e10768f0b3088eb88f4b.zip
Creating machines directory in container create scripts if it's not already existing.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xshare/scripts/debconf1
-rwxr-xr-xshare/scripts/debootstrap2
2 files changed, 3 insertions, 0 deletions
diff --git a/share/scripts/debconf b/share/scripts/debconf
index c08444a..aa1c798 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -990,6 +990,7 @@ Upgrade_system "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" || echo "W: If upgradi
Cleanup_system "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}"
## Specific parts
+mkdir -p "${MACHINES}"
cp -a "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" "${MACHINES}/${NAME}"
# Mounting bind mounts
diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap
index 0a9e733..de9e501 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -129,6 +129,8 @@ DISTRIBUTION="${DISTRIBUTION:-jessie}"
MIRROR="${MIRROR:-http://ftp.debian.org/debian}"
PASSWORD="${PASSWORD:-$(dd if=/dev/urandom bs=12 count=1 2> /dev/null | base64)}"
+mkdir -p "${MACHINES}"
+
debootstrap --arch=${ARCHITECTURE} --include=dbus ${DISTRIBUTION} ${MACHINES}/${NAME} ${MIRROR}
chroot "${MACHINES}/${NAME}" apt-get clean