From: Felix Abecassis <fabecassis@nvidia.com>
Date: Sat, 9 Dec 2017 01:13:01 +0000 (-0800)
Subject: lxc-oci: add support for WorkingDir
X-Git-Tag: lxc-3.0.0.beta1~125^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2016%2Fhead;p=thirdparty%2Flxc.git

lxc-oci: add support for WorkingDir

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
---

diff --git a/templates/lxc-oci.in b/templates/lxc-oci.in
index 3348745a0..95777e086 100755
--- a/templates/lxc-oci.in
+++ b/templates/lxc-oci.in
@@ -140,6 +140,21 @@ getuidgid() {
 	return
 }
 
+# get cwd from oci image.
+getcwd() {
+	if [ "$#" -eq 0 ]; then
+		echo "/"
+		return
+	fi
+
+	configpath="$1"
+
+	cwd=`cat "${configpath}" | jq -c -r '.config.WorkingDir // "/"'`
+
+	echo "${cwd}"
+	return
+}
+
 usage() {
     cat <<EOF
 LXC container template for OCI images
@@ -319,6 +334,9 @@ uidgid=($(getuidgid ${OCI_CONF_FILE}))
 echo "lxc.init.uid = ${uidgid[0]}" >> "${LXC_CONF_FILE}"
 echo "lxc.init.gid = ${uidgid[1]}" >> "${LXC_CONF_FILE}"
 
+cwd=$(getcwd ${OCI_CONF_FILE})
+echo "lxc.init.cwd = ${cwd}" >> "${LXC_CONF_FILE}"
+
 if [ -n "$LXC_MAPPED_UID" ] && [ "$LXC_MAPPED_UID" != "-1" ]; then
     chown $LXC_MAPPED_UID $LXC_PATH/config $LXC_PATH/fstab >/dev/null 2>&1 || true
 fi