svn commit: r272865 - stable/10/etc/rc.d

[Hiroki Sato]

Author: hrs
Date: Thu Oct  9 23:41:11 2014
New Revision: 272865
URL: https://svnweb.freebsd.org/changeset/base/272865

Log:
  MFC r271145:
  
    Fix a bug which prevented mount.fstab parameter from being converted
    when jail_JID_devfs_enable=NO.

Modified:
  stable/10/etc/rc.d/jail
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/jail
==============================================================================
--- stable/10/etc/rc.d/jail	Thu Oct  9 23:40:08 2014	(r272864)
+++ stable/10/etc/rc.d/jail	Thu Oct  9 23:41:11 2014	(r272865)
@@ -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;"