diff options
author | hrs <hrs@FreeBSD.org> | 2014-10-09 23:41:11 +0000 |
---|---|---|
committer | hrs <hrs@FreeBSD.org> | 2014-10-09 23:41:11 +0000 |
commit | b877e6c4f28516c1cee28839e91eb092b44962c8 (patch) | |
tree | 726b9b83a44e98a0ab2a5e3453f9655d5f6f568e | |
parent | 639504a9ff558f782bafc26dd66d9fe777b4d539 (diff) | |
download | FreeBSD-src-b877e6c4f28516c1cee28839e91eb092b44962c8.zip FreeBSD-src-b877e6c4f28516c1cee28839e91eb092b44962c8.tar.gz |
MFC r271145:
Fix a bug which prevented mount.fstab parameter from being converted
when jail_JID_devfs_enable=NO.
-rwxr-xr-x | etc/rc.d/jail | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/rc.d/jail b/etc/rc.d/jail index 2f2645a..0b886fd 100755 --- a/etc/rc.d/jail +++ b/etc/rc.d/jail @@ -207,6 +207,10 @@ parse_options() extract_var $_j consolelog exec.consolelog - \ /var/log/jail_${_j}_console.log + if [ -r $_fstab ]; then + echo " mount.fstab = \"$_fstab\";" + fi + eval : \${jail_${_j}_devfs_enable:=${jail_devfs_enable:-NO}} if checkyesno jail_${_j}_devfs_enable; then echo " mount.devfs;" @@ -222,11 +226,7 @@ parse_options() ;; *) warn "devfs_ruleset must be an integer." ;; esac - if [ -r $_fstab ]; then - echo " mount.fstab = \"$_fstab\";" - fi fi - eval : \${jail_${_j}_fdescfs_enable:=${jail_fdescfs_enable:-NO}} if checkyesno jail_${_j}_fdescfs_enable; then echo " mount.fdescfs;" |