FreeNAS

Revision: 8801
          http://freenas.svn.sourceforge.net/freenas/?rev=8801&view=rev
Author:   jhixson
Date:     2011-11-23 23:51:03 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Add jail path/name

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-11-23 23:17:17 UTC (rev 8800)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-11-23 23:51:03 UTC (rev 8801)
@@ -59,7 +59,7 @@
 		# do this through alias code
 		#ifconfig_${iface}_alias0="inet ${ip} netmask ${netmask}"
 
-		jail_${name}_rootdir="${path}"
+		jail_${name}_rootdir="${path}/${name}"
 		jail_${name}_hostname="${name}"
 		jail_${name}_ip="${ip}"
 		jail_${name}_devfs_enable="YES"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8802
          http://freenas.svn.sourceforge.net/freenas/?rev=8802&view=rev
Author:   jhixson
Date:     2011-11-23 23:54:13 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Remove fdescfs

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-11-23 23:51:03 UTC (rev 8801)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-11-23 23:54:13 UTC (rev 8802)
@@ -65,7 +65,6 @@
 		jail_${name}_devfs_enable="YES"
 		jail_${name}_devfs_enable="YES"
 		jail_${name}_devfs_ruleset="devfsrules_jail"
-		jail_${name}_fdescfs_enable="YES"
 		jail_${name}_procfs_enable="YES"
 		jail_${name}_mount_enable="YES"
 		jail_sysvipc_allow="YES"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8914
          http://freenas.svn.sourceforge.net/freenas/?rev=8914&view=rev
Author:   jhixson
Date:     2011-12-01 22:38:08 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Remove duplicate devfs entry and create fstab entry for nullfs mount.

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-12-01 22:36:23 UTC (rev 8913)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-12-01 22:38:08 UTC (rev 8914)
@@ -39,7 +39,8 @@
 		jail_name,
 		jail_ip,
 		jail_netmask,
-		jail_interface
+		jail_interface,
+		plugins_path
 
 	FROM
 		services_plugins
@@ -49,9 +50,9 @@
 
 	LIMIT 1
 	" | \
-	while read path name ip netmask iface
+	while read path name ip netmask iface plugins
 	do
-		touch "/etc/fstab.${name}"
+		echo "${plugins} ${path}/${name}/mnt nullfs ro 0 0" > "/etc/fstab.${name}"
 
 		# No VIM colors needed here
 		cat<<-__EOF__>>"${tmpfile}"
@@ -63,7 +64,6 @@
 		jail_${name}_hostname="${name}"
 		jail_${name}_ip="${ip}"
 		jail_${name}_devfs_enable="YES"
-		jail_${name}_devfs_enable="YES"
 		jail_${name}_devfs_ruleset="devfsrules_jail"
 		jail_${name}_procfs_enable="YES"
 		jail_${name}_mount_enable="YES"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8923
          http://freenas.svn.sourceforge.net/freenas/?rev=8923&view=rev
Author:   jhixson
Date:     2011-12-02 04:14:41 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
Jail stuff(tm).

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-12-02 04:06:10 UTC (rev 8922)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-12-02 04:14:41 UTC (rev 8923)
@@ -53,6 +53,8 @@
 	while read path name ip netmask iface plugins
 	do
 		echo "${plugins} ${path}/${name}/mnt nullfs ro 0 0" > "/etc/fstab.${name}"
+		cp /etc/resolv.conf ${path}/${name}/etc/resolv.conf
+		sysctl security.jail.allow_raw_sockets=1
 
 		# No VIM colors needed here
 		cat<<-__EOF__>>"${tmpfile}"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9119
          http://freenas.svn.sourceforge.net/freenas/?rev=9119&view=rev
Author:   jhixson
Date:     2011-12-14 05:12:42 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Remove commented out alias configuration since it's now handled in the
plugin jail form.

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-12-14 04:55:26 UTC (rev 9118)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-12-14 05:12:42 UTC (rev 9119)
@@ -59,9 +59,6 @@
 		# No VIM colors needed here
 		cat<<-__EOF__>>"${tmpfile}"
 
-		# do this through alias code
-		#ifconfig_${iface}_alias0="inet ${ip} netmask ${netmask}"
-
 		jail_${name}_rootdir="${path}/${name}"
 		jail_${name}_hostname="${name}"
 		jail_${name}_ip="${ip}"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9120
          http://freenas.svn.sourceforge.net/freenas/?rev=9120&view=rev
Author:   jhixson
Date:     2011-12-14 06:01:50 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Hacky hack that allows jails to actually work.

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-12-14 05:12:42 UTC (rev 9119)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-12-14 06:01:50 UTC (rev 9120)
@@ -81,7 +81,10 @@
 {
 	if srv_enabled plugins
 	then
+		local jail_name="$(get_plugins_jail_name)"
+
 		generate_plugins_jail_config
+		/etc/rc.d/jail start "${jail_name}"
 	fi
 }
 
@@ -89,7 +92,7 @@
 {
 	if srv_enabled plugins
 	then
-		jail_name="$(get_plugins_jail_name)"
+		local jail_name="$(get_plugins_jail_name)"
 		if [ -n "${jail_name}" ]
 		then
 			local tmpfile="$(mktemp -q /var/tmp/.rcfooXXXXXX)"
@@ -98,6 +101,7 @@
 			mv "${tmpfile}" /etc/rc.conf
 
 			rm -f "/etc/fstab.${jail_name}"
+			/etc/rc.d/jail stop "${jail_name}"
 		fi
 	fi
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9251
          http://freenas.svn.sourceforge.net/freenas/?rev=9251&view=rev
Author:   jhixson
Date:     2011-12-21 01:34:03 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
Fixed jail stopping bug.

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-12-21 00:47:13 UTC (rev 9250)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2011-12-21 01:34:03 UTC (rev 9251)
@@ -97,11 +97,11 @@
 		then
 			local tmpfile="$(mktemp -q /var/tmp/.rcfooXXXXXX)"
 
+			/etc/rc.d/jail stop "${jail_name}"
 			grep -v "jail_" /etc/rc.conf > "${tmpfile}"
 			mv "${tmpfile}" /etc/rc.conf
 
 			rm -f "/etc/fstab.${jail_name}"
-			/etc/rc.d/jail stop "${jail_name}"
 		fi
 	fi
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10177
          http://freenas.svn.sourceforge.net/freenas/?rev=10177&view=rev
Author:   jhixson
Date:     2012-02-22 10:18:14 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Use the force.

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-02-22 09:52:42 UTC (rev 10176)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-02-22 10:18:14 UTC (rev 10177)
@@ -105,7 +105,7 @@
 
 plugins_jail_start()
 {
-	if srv_enabled plugins
+	if srv_enabled plugins || [ "${rc_force}" = "yes" ]
 	then
 		local jail_name="$(get_plugins_jail_name)"
 
@@ -116,7 +116,7 @@
 
 plugins_jail_stop()
 {
-	if srv_enabled plugins
+	if srv_enabled plugins || [ "${rc_force}" = "yes" ]
 	then
 		local jail_name="$(get_plugins_jail_name)"
 		if [ -n "${jail_name}" ]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10223
          http://freenas.svn.sourceforge.net/freenas/?rev=10223&view=rev
Author:   jhixson
Date:     2012-02-23 21:57:21 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Fix read-only pbi nullfs mount to be read-write.

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-02-23 21:55:22 UTC (rev 10222)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-02-23 21:57:21 UTC (rev 10223)
@@ -77,7 +77,7 @@
 		fi
 
 		echo "${plugins} ${mntpath_plugins} nullfs ro 0 0" > "/etc/fstab.${name}"
-		echo "${plugins}/pbi ${mntpath_pbi} nullfs ro 0 0" >> "/etc/fstab.${name}"
+		echo "${plugins}/pbi ${mntpath_pbi} nullfs rw 0 0" >> "/etc/fstab.${name}"
 
 		cp /etc/resolv.conf ${path}/${name}/etc/resolv.conf
 		sysctl security.jail.allow_raw_sockets=1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10824
          http://freenas.svn.sourceforge.net/freenas/?rev=10824&view=rev
Author:   zippybr
Date:     2012-03-22 18:22:03 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
Mount custom NullMountPoint on plugin jail start

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-03-22 17:48:49 UTC (rev 10823)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-03-22 18:22:03 UTC (rev 10824)
@@ -58,7 +58,7 @@
 
 	LIMIT 1
 	" | \
-	while read path name ip plugins
+	while read -r path name ip plugins
 	do
 		local mntpath_plugins="${path}/${name}/mnt/plugins"
 		local mntpath_pbi="${path}/${name}/usr/pbi"
@@ -79,6 +79,18 @@
 		echo "${plugins} ${mntpath_plugins} nullfs ro 0 0" > "/etc/fstab.${name}"
 		echo "${plugins}/pbi ${mntpath_pbi} nullfs rw 0 0" >> "/etc/fstab.${name}"
 
+		${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "
+		SELECT
+			source,
+			destination
+		FROM
+			plugins_nullmountpoint
+		" | \
+		while read -r source destination
+		do
+			echo "${source} ${path}/${name}/${destination} nullfs rw 0 0" >> "/etc/fstab.${name}"
+		done
+
 		cp /etc/resolv.conf ${path}/${name}/etc/resolv.conf
 		sysctl security.jail.allow_raw_sockets=1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11446
          http://freenas.svn.sourceforge.net/freenas/?rev=11446&view=rev
Author:   zippybr
Date:     2012-05-10 17:02:15 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Remove jail ip from arp table on stop

epair generates random mac for every new interface, restarting
jail without cleaning the arp entry might get into connectivity issues.

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-05-10 16:46:54 UTC (rev 11445)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-05-10 17:02:15 UTC (rev 11446)
@@ -150,6 +150,7 @@
 			cat<<-__EOF__>> /etc/rc.conf
 			jail_${jail_name}_exec_poststop0="ifconfig ${bridge} destroy"
 			jail_${jail_name}_exec_poststop1="ifconfig ${epair} destroy"
+			jail_${jail_name}_exec_poststop2="arp -d ${ipv4addr}"
 __EOF__
 
 		fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11501
          http://freenas.svn.sourceforge.net/freenas/?rev=11501&view=rev
Author:   jhixson
Date:     2012-05-18 17:50:40 +0000 (Fri, 18 May 2012)
Log Message:
-----------
make /mnt/plugins writable.

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-05-18 16:34:37 UTC (rev 11500)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-05-18 17:50:40 UTC (rev 11501)
@@ -64,7 +64,7 @@
 			mkdir -p "${mntpath_pbi}"
 		fi
 
-		echo "${plugins} ${mntpath_plugins} nullfs ro 0 0" > "/etc/fstab.${name}"
+		echo "${plugins} ${mntpath_plugins} nullfs rw 0 0" > "/etc/fstab.${name}"
 		echo "${plugins}/pbi ${mntpath_pbi} nullfs rw 0 0" >> "/etc/fstab.${name}"
 
 		${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11685
          http://freenas.svn.sourceforge.net/freenas/?rev=11685&view=rev
Author:   zippybr
Date:     2012-06-11 17:28:21 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Fix jail start using interfaces with MTU != 1500

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-06-11 17:08:50 UTC (rev 11684)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-06-11 17:28:21 UTC (rev 11685)
@@ -129,15 +129,17 @@
 
 			ipv4addr=$(echo ${jail}|cut -d "|" -f 1)
 			ipv4netmask=$(echo ${jail}|cut -d "|" -f 2)
-			bridge=$(ifconfig bridge create)
-			epair=$(ifconfig epair create)
+			defaultroute=$(netstat -rn | grep default|awk '{print $2}')
+			#FIXME: perhaps select which iface to bridge with in the GUI
+			defaultif=$(netstat -rn | grep default|awk '{print $6}')
+			mtu=$(ifconfig | grep "^${defaultif}" | sed -E 's/.*mtu ([0-9]+)/\1/g')
+			bridge=$(ifconfig bridge create mtu ${mtu})
+			epair=$(ifconfig epair create mtu ${mtu})
 			ifconfig ${epair} up
 			epairb=$(echo ${epair}|sed -E "s/([0-9])a$/\1b/g")
 			ifconfig ${bridge} addm ${epair} up
 			jail_id=$(jls | tail +2 |grep "\b${jail_name}\b"|awk '{print $1}')
 			ifconfig ${epairb} vnet ${jail_id}
-			defaultroute=$(netstat -rn | grep default|awk '{print $2}')
-			defaultif=$(netstat -rn | grep default|awk '{print $6}')
 			jexec ${jail_id} ifconfig lo0 127.0.0.1
 			jexec ${jail_id} ifconfig ${epairb} ${ipv4addr}/${ipv4netmask}
 			if [ -n "${defaultroute}" ]; then

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11739
          http://freenas.svn.sourceforge.net/freenas/?rev=11739&view=rev
Author:   zippybr
Date:     2012-06-18 14:05:28 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Mount points with spaces might get jail start stuck due to invalid fstab

Replace spaces for \040, which is still not valid in FreeBSD,
but at least report the filesystem as not found and let the jail start.

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-06-18 13:31:20 UTC (rev 11738)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-06-18 14:05:28 UTC (rev 11739)
@@ -64,8 +64,8 @@
 			mkdir -p "${mntpath_pbi}"
 		fi
 
-		echo "${plugins} ${mntpath_plugins} nullfs rw 0 0" > "/etc/fstab.${name}"
-		echo "${plugins}/pbi ${mntpath_pbi} nullfs rw 0 0" >> "/etc/fstab.${name}"
+		echo "${plugins}	${mntpath_plugins}	nullfs	rw	0	0" | sed 's/ /\\040/g' > "/etc/fstab.${name}"
+		echo "${plugins}/pbi	${mntpath_pbi}	nullfs	rw	0	0" | sed 's/ /\\040/g' >> "/etc/fstab.${name}"
 
 		${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "
 		SELECT
@@ -76,7 +76,7 @@
 		" | \
 		while read -r source destination
 		do
-			echo "${source} ${path}/${name}/${destination} nullfs rw 0 0" >> "/etc/fstab.${name}"
+			echo "${source}	${path}/${name}/${destination}	nullfs	rw	0	0" | sed 's/ /\\040/g' >> "/etc/fstab.${name}"
 		done
 
 		cp /etc/resolv.conf ${path}/${name}/etc/resolv.conf 2> /dev/null

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11747
          http://freenas.svn.sourceforge.net/freenas/?rev=11747&view=rev
Author:   zippybr
Date:     2012-06-19 13:38:27 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Make plugins jail persist so we can set up network by hand

This is required so /etc/rc can run in a later stage, otherwise
some daemons that depend on network might fail starting

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-06-19 13:37:14 UTC (rev 11746)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-06-19 13:38:27 UTC (rev 11747)
@@ -92,6 +92,9 @@
 		jail_${name}_procfs_enable="YES"
 		jail_${name}_mount_enable="YES"
 		jail_${name}_vnet_enable="YES"
+		jail_${name}_flags="-l -U root -c persist"
+		jail_${name}_exec_afterstart0="ifconfig lo0 127.0.0.1"
+		jail_${name}_exec_start="/bin/sh /dev/null"
 		jail_sysvipc_allow="YES"
 		jail_list="${name}"
 		jail_v2_enable="YES"
@@ -140,7 +143,6 @@
 			ifconfig ${bridge} addm ${epair} up
 			jail_id=$(jls | tail +2 |grep "\b${jail_name}\b"|awk '{print $1}')
 			ifconfig ${epairb} vnet ${jail_id}
-			jexec ${jail_id} ifconfig lo0 127.0.0.1
 			jexec ${jail_id} ifconfig ${epairb} ${ipv4addr}/${ipv4netmask}
 			if [ -n "${defaultroute}" ]; then
 				jexec ${jail_id} route add default ${defaultroute}
@@ -149,10 +151,13 @@
 				ifconfig ${bridge} addm ${defaultif}
 			fi
 
+			jexec ${jail_id} /bin/sh /etc/rc
+
 			cat<<-__EOF__>> /etc/rc.conf
 			jail_${jail_name}_exec_poststop0="ifconfig ${bridge} destroy"
 			jail_${jail_name}_exec_poststop1="ifconfig ${epair} destroy"
 			jail_${jail_name}_exec_poststop2="arp -d ${ipv4addr}"
+			jail_${jail_name}_exec_poststop3="jail -r ${jail_id}"
 __EOF__
 
 		fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11833
          http://freenas.svn.sourceforge.net/freenas/?rev=11833&view=rev
Author:   zippybr
Date:     2012-07-05 14:41:11 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Make sure we could determine jail id before proceeding

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-07-04 20:48:48 UTC (rev 11832)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-07-05 14:41:11 UTC (rev 11833)
@@ -132,6 +132,12 @@
 			LIMIT 1;
 			")
 
+			jail_id=$(jls | tail +2 |grep "\b${jail_name}\b"|awk '{print $1}')
+			if [ -z ${jail_id} ]; then
+				logger -t ix-jail "Could not determine jail id (not running?)"
+				return 1
+			fi
+
 			ipv4addr=$(echo ${jail}|cut -d "|" -f 1)
 			ipv4netmask=$(echo ${jail}|cut -d "|" -f 2)
 			defaultroute=$(netstat -rn | grep default|awk '{print $2}')
@@ -143,7 +149,6 @@
 			ifconfig ${epair} up
 			epairb=$(echo ${epair}|sed -E "s/([0-9])a$/\1b/g")
 			ifconfig ${bridge} addm ${epair} up
-			jail_id=$(jls | tail +2 |grep "\b${jail_name}\b"|awk '{print $1}')
 			ifconfig ${epairb} vnet ${jail_id}
 			jexec ${jail_id} ifconfig ${epairb} ${ipv4addr}/${ipv4netmask}
 			if [ -n "${defaultroute}" ]; then

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11923
          http://freenas.svn.sourceforge.net/freenas/?rev=11923&view=rev
Author:   zippybr
Date:     2012-07-18 15:28:17 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Make sure to just grab inet for now and forget about inet6

This fixes an issue to start jail with IPv6 configured on host

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-07-18 13:31:43 UTC (rev 11922)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-07-18 15:28:17 UTC (rev 11923)
@@ -138,9 +138,11 @@
 
 			ipv4addr=$(echo ${jail}|cut -d "|" -f 1)
 			ipv4netmask=$(echo ${jail}|cut -d "|" -f 2)
-			defaultroute=$(netstat -rn | grep default|awk '{print $2}')
+			#FIXME: ipv6
+			defaultroute=$(netstat -f inet -rn | grep default|awk '{print $2}')
 			#FIXME: perhaps select which iface to bridge with in the GUI
-			defaultif=$(netstat -rn | grep default|awk '{print $6}')
+			#FIXME: ipv6
+			defaultif=$(netstat -f inet -rn | grep default|awk '{print $6}')
 			mtu=$(ifconfig | grep "^${defaultif}" | sed -E 's/.*mtu ([0-9]+)/\1/g')
 			bridge=$(ifconfig bridge create mtu ${mtu})
 			epair=$(ifconfig epair create mtu ${mtu})

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11981
          http://freenas.svn.sourceforge.net/freenas/?rev=11981&view=rev
Author:   zippybr
Date:     2012-07-26 11:50:27 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
Try to start /etc/rc in background

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-07-26 09:00:43 UTC (rev 11980)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-07-26 11:50:27 UTC (rev 11981)
@@ -158,7 +158,7 @@
 				ifconfig ${bridge} addm ${defaultif}
 			fi
 
-			jexec ${jail_id} /bin/sh /etc/rc
+			jexec ${jail_id} /bin/sh /etc/rc &
 
 			cat<<-__EOF__>> /etc/rc.conf
 			jail_${jail_name}_exec_poststop0="ifconfig ${bridge} destroy"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12261
          http://freenas.svn.sourceforge.net/freenas/?rev=12261&view=rev
Author:   zippybr
Date:     2012-08-31 10:42:18 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
Copy localtime from host to the jail

ticket: #1765

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-08-31 10:41:12 UTC (rev 12260)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2012-08-31 10:42:18 UTC (rev 12261)
@@ -80,6 +80,7 @@
 		done
 
 		cp /etc/resolv.conf ${path}/${name}/etc/resolv.conf 2> /dev/null
+		cp /etc/localtime ${path}/${name}/etc/localtime 2> /dev/null
 		sysctl security.jail.allow_raw_sockets=1
 
 		# No VIM colors needed here

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12964
          http://freenas.svn.sourceforge.net/freenas/?rev=12964&view=rev
Author:   zippybr
Date:     2013-01-02 15:05:13 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
Skip if jail path name does not exist

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2013-01-02 10:44:30 UTC (rev 12963)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2013-01-02 15:05:13 UTC (rev 12964)
@@ -51,6 +51,11 @@
 		local mntpath_plugins="${path}/${name}/mnt/plugins"
 		local mntpath_pbi="${path}/${name}/usr/pbi"
 
+		# Skip if jail path name does not exist
+		if [ ! -d "${path}/${name}" ]; then
+			continue
+		fi
+
 		if [ ! -d "${plugins}/pbi" ]
 		then
 			mkdir -p "${plugins}/pbi"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13020
          http://freenas.svn.sourceforge.net/freenas/?rev=13020&view=rev
Author:   zippybr
Date:     2013-01-14 17:26:39 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
Determination of default gateway interface name may fail

ticket: #1997
Submitted by: QZmn7igVMc

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-jail

Modified: trunk/nanobsd/Files/etc/rc.d/ix-jail
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-jail	2013-01-14 16:22:54 UTC (rev 13019)
+++ trunk/nanobsd/Files/etc/rc.d/ix-jail	2013-01-14 17:26:39 UTC (rev 13020)
@@ -150,7 +150,8 @@
 			defaultroute=$(netstat -f inet -rn | grep default|awk '{print $2}')
 			#FIXME: perhaps select which iface to bridge with in the GUI
 			#FIXME: ipv6
-			defaultif=$(netstat -f inet -rn | grep default|awk '{print $6}')
+			#NOTE: Use -W for wider field size (#1997)
+			defaultif=$(netstat -f inet -rnW | grep default|awk '{print $7}')
 			mtu=$(ifconfig | grep "^${defaultif}" | sed -E 's/.*mtu ([0-9]+)/\1/g')
 			bridge=$(ifconfig bridge create mtu ${mtu})
 			epair=$(ifconfig epair create mtu ${mtu})

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.