matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Added jail_${name}_flags variable

Browse source 
To make future work, such as resource limiting (rctl(8)) easier, added
"-n ${name}" to jail_flags for each jail.
This commit is contained in:
Jake Guffey 2012-04-23 14:39:26 -04:00
commit 131889b454
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
conf/type/__jail/gencode-remote
View file

@ -198,8 +198,8 @@ cat <<EOF
cp -r ${jaildir}/base/usr/home/* "${jaildir}/rw/${name}/home/" cp -r ${jaildir}/base/usr/home/* "${jaildir}/rw/${name}/home/"
fi fi
mkdir "${jaildir}/rw/${name}/root" mkdir "${jaildir}/rw/${name}/root"
if [ -n "\$(ls ${jaildir}/base/root)" ]; then if [ -n "\$(ls -A ${jaildir}/base/root)" ]; then
cp -r ${jaildir}/base/root/* "${jaildir}/rw/${name}/root/" cp -r ${jaildir}/base/root/ "${jaildir}/rw/${name}/root/"
fi fi
EOF EOF
@ -234,7 +234,8 @@ jail_${name}_hostname="${hostname}"
jail_${name}_ip="${ip}" jail_${name}_ip="${ip}"
jail_${name}_devfs_enable="${devfsenable}" jail_${name}_devfs_enable="${devfsenable}"
jail_${name}_mount_enable="YES" jail_${name}_mount_enable="YES"
jail_${name}_fstab="/etc/fstab.$name" jail_${name}_fstab="/etc/fstab.${name}"
jail_${name}_flags="-n ${name} \\\${jail_flags}"
END END
EOF EOF