[Midnightbsd-cvs] src [9072] trunk/etc/rc.d/jail: add conditional sleep per jail if we add IPv6 addresses.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Oct 1 06:17:05 EDT 2016


Revision: 9072
          http://svnweb.midnightbsd.org/src/?rev=9072
Author:   laffer1
Date:     2016-10-01 06:17:05 -0400 (Sat, 01 Oct 2016)
Log Message:
-----------
add conditional sleep per jail if we add IPv6 addresses.

Modified Paths:
--------------
    trunk/etc/rc.d/jail

Modified: trunk/etc/rc.d/jail
===================================================================
--- trunk/etc/rc.d/jail	2016-10-01 10:16:11 UTC (rev 9071)
+++ trunk/etc/rc.d/jail	2016-10-01 10:17:05 UTC (rev 9072)
@@ -509,7 +509,7 @@
 		esac
 		case "${_type}" in
 		inet)	;;
-		inet6)	;;
+		inet6)	ipv6_address_count=$((ipv6_address_count + 1)) ;;
 		*)	warn "Could not determine address family.  Not going" \
 			    "to ${_action} address '${_addr}' for ${_jail}."
 			continue
@@ -546,6 +546,7 @@
 	esac
 
 	# Handle addresses.
+	ipv6_address_count=0
 	jail_handle_ips_option ${_action} "${_ip}"
 	# Handle jail_xxx_ip_multi<N>
 	alias=0
@@ -558,6 +559,12 @@
 			;;
 		esac
 	done
+	case ${ipv6_address_count} in
+	0)	;;
+	*)	# Sleep 1 second to let DAD complete before starting services.
+		sleep 1
+		;;
+	esac
 }
 
 jail_prestart()



More information about the Midnightbsd-cvs mailing list