ruben/ezjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix adding a .device entry into the fstab of a zfs-backed jail when renaming

Browse Source 
- don't unmount a zfs-backed jail when starting it fails
This commit is contained in:
cryx 2010-01-24 18:33:09 +00:00
parent b3c31cfe15
commit 9a3ccdcbb7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ezjail-admin
View File

@ -221,6 +221,7 @@ fetchjailinfo () {
case ${ezjail_imagetype} in case ${ezjail_imagetype} in
crypto|bde) ezjail_imagedevice=${ezjail_device_geom%.bde} ;; crypto|bde) ezjail_imagedevice=${ezjail_device_geom%.bde} ;;
eli) ezjail_imagedevice=${ezjail_device_geom%.eli} ;; eli) ezjail_imagedevice=${ezjail_device_geom%.eli} ;;
zfs) ezjail_imagedevice='' ;;
*) ezjail_imagedevice=${ezjail_device_geom} ;; *) ezjail_imagedevice=${ezjail_device_geom} ;;
esac esac
@ -1267,7 +1268,7 @@ config)
# rename fstab # rename fstab
rm -f "/etc/fstab.${ezjail_old_safename}" rm -f "/etc/fstab.${ezjail_old_safename}"
echo -n > "/etc/fstab.${ezjail_safename}" echo -n > "/etc/fstab.${ezjail_safename}"
[ "${ezjail_imagetype}" ] && \ [ "${ezjail_imagetype}" -a "${ezjail_imagetype}" != "zfs" ] && \
echo ${ezjail_rootdir}.device ${ezjail_rootdir} ufs rw 0 0 >> "/etc/fstab.${ezjail_safename}" echo ${ezjail_rootdir}.device ${ezjail_rootdir} ufs rw 0 0 >> "/etc/fstab.${ezjail_safename}"
echo ${ezjail_jailbase} ${ezjail_rootdir}/basejail nullfs ro 0 0 >> "/etc/fstab.${ezjail_safename}" echo ${ezjail_jailbase} ${ezjail_rootdir}/basejail nullfs ro 0 0 >> "/etc/fstab.${ezjail_safename}"