summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
authorPetr Ospalý <p.ospaly@partner.samsung.com>2019-01-07 13:28:57 +0100
committerPetr Ospalý <p.ospaly@partner.samsung.com>2019-01-07 13:37:36 +0100
commitfb01a659da5c4216ff20007341d789ac9c7df933 (patch)
tree60a256c7d7456e7015ae1dffdd2d9bce7b508b85 /ansible
parent7acff5e6275568fccd384cdc1ec7b508a178a571 (diff)
Add support for plain files mounting into chroot
In this commit I tried to follow a behaviour of docker. If mounted path does not exist then it will handle it as a directory - it creates it and the mountpoint is expected to be a directory also. If the mounted path is a plain file it will do file bind mounting. The mountpoint must be a plain file. Change-Id: Ie8b29442c8ebb8da389ba6c9a152a49d8cf6e9be Issue-ID: OOM-1575 Signed-off-by: Petr Ospalý <p.ospaly@partner.samsung.com>
Diffstat (limited to 'ansible')
-rwxr-xr-xansible/docker/run_chroot.sh37
-rwxr-xr-xansible/run_playbook.sh4
2 files changed, 28 insertions, 13 deletions
diff --git a/ansible/docker/run_chroot.sh b/ansible/docker/run_chroot.sh
index 1ab26373..3359fdcd 100755
--- a/ansible/docker/run_chroot.sh
+++ b/ansible/docker/run_chroot.sh
@@ -192,11 +192,7 @@ check_external_mounts()
;;
esac
- if ! [ -d "$external" ] ; then
- echo ERROR: "Directory for mounting does not exist: ${external}" >&2
- exit 1
- fi
-
+ # sanity check that the mountpoint is not empty or the root directory itself
if echo "$internal" | grep -q '^/*$' ; then
echo ERROR: "Unacceptable internal path: ${internal}" >&2
exit 1
@@ -218,8 +214,31 @@ do_external_mounts()
exit 1
fi
- if ! mkdir -p "${CHROOT_DIR}/${internal}" ; then
- echo ERROR: "Cannot create mountpoint: ${CHROOT_DIR}/${internal}" >&2
+ # trying to follow the behaviour of docker
+ if ! [ -e "$external" ] || [ -d "$external" ] ; then
+ # external is a dir
+ if ! mkdir -p "$external" ; then
+ echo ERROR: "Cannot create directory: ${external}" >&2
+ exit 1
+ fi
+ if ! mkdir -p "${CHROOT_DIR}/${internal}" ; then
+ echo ERROR: "Cannot create mountpoint: ${CHROOT_DIR}/${internal}" >&2
+ exit 1
+ fi
+ elif [ -f "$external" ] ; then
+ # if external is a file mount it as a file
+ if [ -e "${CHROOT_DIR}/${internal}" ] && ! [ -f "${CHROOT_DIR}/${internal}" ] ; then
+ echo ERROR: "Mounting a file but the mountpoint is not a file: ${CHROOT_DIR}/${internal}" >&2
+ exit 1
+ else
+ if ! touch "${CHROOT_DIR}/${internal}" ; then
+ echo ERROR: "Cannot create mountpoint: ${CHROOT_DIR}/${internal}" >&2
+ exit 1
+ fi
+ fi
+ else
+ # anything but a simple file or a directory will fail
+ echo ERROR: "Unsupported mount: ${external} -> ${internal}" >&2
exit 1
fi
@@ -448,10 +467,6 @@ case "$action" in
install_wrapper
# execute chroot
- # copy resolv.conf and hosts file
- cp -a /etc/resolv.conf "$CHROOT_DIR"/etc/resolv.conf
- cp -a /etc/hosts "$CHROOT_DIR"/etc/hosts
-
if [ -n "$1" ] ; then
:
else
diff --git a/ansible/run_playbook.sh b/ansible/run_playbook.sh
index 88c86bc3..9a2ca56f 100755
--- a/ansible/run_playbook.sh
+++ b/ansible/run_playbook.sh
@@ -119,13 +119,13 @@ if ! [ -d "$ANSIBLE_CHROOT" ] ; then
fi
# run chroot
-mkdir -p "$ANSIBLE_DIR"/application
-mkdir -p "$ANSIBLE_DIR"/certs
"$ANSIBLE_DIR"/docker/run_chroot.sh \
--mount rw:"${HOME}/.ssh":/root/.ssh \
--mount ro:"$ANSIBLE_DIR":/ansible \
--mount rw:"$ANSIBLE_DIR"/application:/ansible/application \
--mount rw:"$ANSIBLE_DIR"/certs:/certs \
+ --mount ro:/etc/resolv.conf:/etc/resolv.conf \
+ --mount ro:/etc/hosts:/etc/hosts \
--workdir /ansible \
execute "$ANSIBLE_CHROOT" ansible-playbook "$@"