smf-base (2.10+2) unstable; urgency=medium

* network/physical and network/loopback depend on filesystem/root to
    fix races on livecd (network-depends-on-root-fs.patch)

smf-base/debian/changelog

@@ -1,3 +1,10 @@
+smf-base (2.10+2) unstable; urgency=medium
+
+  * network/physical and network/loopback depend on filesystem/root to
+    fix races on livecd (network-depends-on-root-fs.patch)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Tue, 17 Jun 2014 10:30:15 +0400
+
 smf-base (2.10+1) unstable; urgency=low
 
   * Use native version scheme

smf-base/debian/patches/network-depends-on-root-fs.patch

@@ -0,0 +1,39 @@
+Description: fixes race on livecd
+Index: smf-base/usr/src/cmd/svc/milestone/network-loopback.xml
+===================================================================
+--- smf-base.orig/usr/src/cmd/svc/milestone/network-loopback.xml	2012-10-08 04:25:33.000000000 +0400
++++ smf-base/usr/src/cmd/svc/milestone/network-loopback.xml	2014-06-17 10:28:39.475009277 +0400
+@@ -41,6 +41,14 @@
+ 
+ 	<instance name='default' enabled='true'>
+ 
++	<dependency
++		name='rootfs'
++		grouping='require_all'
++		restart_on='none'
++		type='service'>
++		<service_fmri value='svc:/system/filesystem/root' />
++	</dependency>
++
+ 	<exec_method
+ 		type='method'
+ 		name='start'
+Index: smf-base/usr/src/cmd/svc/milestone/network-physical.xml
+===================================================================
+--- smf-base.orig/usr/src/cmd/svc/milestone/network-physical.xml	2014-06-17 09:22:14.487257218 +0400
++++ smf-base/usr/src/cmd/svc/milestone/network-physical.xml	2014-06-17 10:28:37.438939534 +0400
+@@ -36,6 +36,14 @@
+ 	type='service'
+ 	version='1'>
+ 
++	<dependency
++		name='rootfs'
++		grouping='require_all'
++		restart_on='none'
++		type='service'>
++		<service_fmri value='svc:/system/filesystem/root' />
++	</dependency>
++
+ 	<!-- ifconfig needs loopback for IPC with dhcpagent -->
+ 	<dependency
+ 		name='loopback'

smf-base/debian/patches/series

@@ -11,3 +11,4 @@ smf-remove-nwam.patch
 fs-local-find-zfs.patch
 service_bundle-dtd-path.patch
 service_bundle-cleanup.patch
+network-depends-on-root-fs.patch

smf-base/debian/rules

@@ -2,12 +2,6 @@
 
 export DH_VERBOSE = 1
 
-cmd := \
-	svc/svcadm \
-	svc/svccfg \
-	svc/svcs \
-	svc/svcprop
-
 unpack: unpack-stamp
 unpack-stamp:
 	dh_testdir
@@ -58,6 +52,6 @@ binary-stamp: patch-stamp
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	dh_clean README
 	rm -rf usr .pc
+	dh_clean README