Commit a787c332 by Felix Abecassis

lxc-oci: add support for WorkingDir

parent 8f54d926
...@@ -140,6 +140,21 @@ getuidgid() { ...@@ -140,6 +140,21 @@ getuidgid() {
return 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() { usage() {
cat <<EOF cat <<EOF
LXC container template for OCI images LXC container template for OCI images
...@@ -319,6 +334,9 @@ uidgid=($(getuidgid ${OCI_CONF_FILE})) ...@@ -319,6 +334,9 @@ uidgid=($(getuidgid ${OCI_CONF_FILE}))
echo "lxc.init.uid = ${uidgid[0]}" >> "${LXC_CONF_FILE}" echo "lxc.init.uid = ${uidgid[0]}" >> "${LXC_CONF_FILE}"
echo "lxc.init.gid = ${uidgid[1]}" >> "${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 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 chown $LXC_MAPPED_UID $LXC_PATH/config $LXC_PATH/fstab >/dev/null 2>&1 || true
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment