proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 05:59:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc-oci: import common.conf and userns.conf

Browse Source 
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
This commit is contained in:
Felix Abecassis 2017-11-21 13:49:40 -08:00
parent 996202e74a
commit d7c685c6be
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/lxc-oci.in
View File

@ -34,6 +34,8 @@ for bin in skopeo umoci jq; do
fi fi
done done
LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
# Some useful functions # Some useful functions
cleanup() { cleanup() {
if [ -d "$DOWNLOAD_TEMP" ]; then if [ -d "$DOWNLOAD_TEMP" ]; then
@ -233,6 +235,14 @@ while read -r line; do
echo "lxc.environment = ${line}" >> "${LXC_CONF_FILE}" echo "lxc.environment = ${line}" >> "${LXC_CONF_FILE}"
done <<< "${environment}" done <<< "${environment}"
if [ -e "${LXC_TEMPLATE_CONFIG}/common.conf" ]; then
echo "lxc.include = ${LXC_TEMPLATE_CONFIG}/common.conf" >> "${LXC_CONF_FILE}"
fi
if [ -n "$LXC_MAPPED_UID" ] && [ "$LXC_MAPPED_UID" != "-1" ] && [ -e "${LXC_TEMPLATE_CONFIG}/userns.conf" ]; then
echo "lxc.include = ${LXC_TEMPLATE_CONFIG}/userns.conf" >> "${LXC_CONF_FILE}"
fi
echo "lxc.uts.name = ${LXC_NAME}" >> "${LXC_CONF_FILE}" echo "lxc.uts.name = ${LXC_NAME}" >> "${LXC_CONF_FILE}"
# set the hostname # set the hostname
cat <<EOF > ${LXC_ROOTFS}/etc/hostname cat <<EOF > ${LXC_ROOTFS}/etc/hostname