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

Fixed variable naming in /etc/fstab.$name

Browse source 
had referenced $jailbase when meaning to reference $jaildir
This commit is contained in:
Jake Guffey 2012-04-30 17:29:08 -04:00
commit 4b11a6172d
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,9 +140,9 @@ deleteJail() {
fi fi
EOF EOF
# Remove the jail's rw mountpoints # Remove the jail's rw mountpoints
echo "rm -rf \"${jailbase}/rw/${name}\"" echo "rm -rf \"${jaildir}/rw/${name}\""
# Remove the jail directory # Remove the jail directory
echo "rm -rf \"${jailbase}/${name}\"" echo "rm -rf \"${jaildir}/${name}\""
# Remove the jail's fstab # Remove the jail's fstab
echo "rm -f \"/etc/fstab.${name}\"" echo "rm -f \"/etc/fstab.${name}\""
# Remove jail_$name_* lines from rc.conf # Remove jail_$name_* lines from rc.conf
@ -212,12 +212,12 @@ EOF
# Create the ro+rw mountpoint entries in fstab # Create the ro+rw mountpoint entries in fstab
cat <<EOF cat <<EOF
cat >/etc/fstab.${name} <<END cat >/etc/fstab.${name} <<END
${jailbase}/base ${jailbase}/${name} nullfs ro 0 0 ${jaildir}/base ${jaildir}/${name} nullfs ro 0 0
${jailbase}/rw/${name}/etc ${jailbase}/${name}/etc nullfs rw 0 0 ${jaildir}/rw/${name}/etc ${jaildir}/${name}/etc nullfs rw 0 0
${jailbase}/rw/${name}/local ${jailbase}/${name}/usr/local nullfs rw 0 0 ${jaildir}/rw/${name}/local ${jaildir}/${name}/usr/local nullfs rw 0 0
${jailbase}/rw/${name}/var ${jailbase}/${name}/var nullfs rw 0 0 ${jaildir}/rw/${name}/var ${jaildir}/${name}/var nullfs rw 0 0
${jailbase}/rw/${name}/home ${jailbase}/${name}/usr/home nullfs rw 0 0 ${jaildir}/rw/${name}/home ${jaildir}/${name}/usr/home nullfs rw 0 0
${jailbase}/rw/${name}/root ${jailbase}/${name}/root nullfs rw 0 0 ${jaildir}/rw/${name}/root ${jaildir}/${name}/root nullfs rw 0 0
END END
EOF EOF