smf-base (2.10-6) unstable; urgency=low

  * Remove network/physical:nwam

4 files changed, 95 insertions, 0 deletions

diff --git a/smf-base/debian/changelog b/smf-base/debian/changelog
index af8fd09..344cc1c 100644
--- a/smf-base/debian/changelog
+++ b/smf-base/debian/changelog
@@ -1,3 +1,9 @@
+smf-base (2.10-6) unstable; urgency=low
+
+  * Remove network/physical:nwam
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 30 Mar 2013 11:03:00 +0000
+
 smf-base (2.10-5) unstable; urgency=low
 
   * Log dir is /var/log/svc, /var/svc/log is a symlink
diff --git a/smf-base/debian/patches/series b/smf-base/debian/patches/series
index e6ee3e2..9b928e2 100644
--- a/smf-base/debian/patches/series
+++ b/smf-base/debian/patches/series
@@ -7,3 +7,4 @@ smf-no-rc3.patch
 disable-fast-reboot.patch
 man-5-smf-no-legacy.patch
 smf-need-var-run-lock.patch
+smf-remove-nwam.patch
diff --git a/smf-base/debian/patches/smf-remove-nwam.patch b/smf-base/debian/patches/smf-remove-nwam.patch
new file mode 100644
index 0000000..85bb74a
--- /dev/null
+++ b/smf-base/debian/patches/smf-remove-nwam.patch
@@ -0,0 +1,86 @@
+Index: smf-base/usr/src/cmd/svc/milestone/network-physical.xml
+===================================================================
+--- smf-base.orig/usr/src/cmd/svc/milestone/network-physical.xml	2012-10-08 00:25:33.000000000 +0000
++++ smf-base/usr/src/cmd/svc/milestone/network-physical.xml	2013-03-30 11:00:27.327399342 +0000
+@@ -91,81 +91,6 @@
+ 
+ 	</instance>
+ 
+-	<instance name='nwam' enabled='false'>
+-
+-	<exec_method
+-		type='method'
+-		name='start'
+-		exec='/lib/svc/method/net-nwam start'
+-		timeout_seconds='120' >
+-		<method_context>
+-			<method_credential user='root' group='root'
+-				supp_groups='netadm' privileges='zone' />
+-		</method_context>
+-	</exec_method>
+-
+-	<exec_method
+-		type='method'
+-		name='stop'
+-		exec='/lib/svc/method/net-nwam stop'
+-		timeout_seconds='60' >
+-		<method_context>
+-			<method_credential user='root' group='root'
+-				supp_groups='netadm' privileges='zone' />
+-		</method_context>
+-	</exec_method>
+-
+-	<exec_method
+-		type='method'
+-		name='refresh'
+-		exec='/lib/svc/method/net-nwam refresh'
+-		timeout_seconds='60' >
+-		<method_context>
+-			<method_credential user='root' group='root'
+-				supp_groups='netadm' privileges='zone' />
+-		</method_context>
+-	</exec_method>
+-
+-	<property_group name='general' type='framework'>
+-		<!-- to start/stop NWAM services -->
+-		<propval name='action_authorization' type='astring'
+-			value='solaris.smf.manage.nwam' />
+-		<propval name='value_authorization' type='astring'
+-			value='solaris.smf.manage.nwam' />
+-	</property_group>
+-
+-	<property_group name='nwamd' type='application'>
+-		<stability value='Unstable' />
+-		<propval name='debug' type='boolean' value='false' />
+-		<propval name='autoconf' type='boolean' value='false' />
+-		<propval name='ncu_wait_time' type='count' value='60' />
+-		<propval name='condition_check_interval' type='count'
+-			value='120' />
+-		<propval name='scan_interval' type='count' value='120' />
+-		<propval name='scan_level' type='astring' value='weak' />
+-		<propval name='strict_bssid' type='boolean' value='false' />
+-		<propval name='active_ncp' type='astring' value='Automatic' />
+-		<propval name='value_authorization' type='astring'
+-			value='solaris.smf.value.nwam' />
+-	</property_group>
+-
+-	<template>
+-		<common_name>
+-			<loctext xml:lang='C'>
+-				physical network interface autoconfiguration
+-			</loctext>
+-		</common_name>
+-		<documentation>
+-			<manpage title='nwamd' section='1M'
+-				manpath='/usr/share/man' />
+-			<doc_link
+-			    name='Network Auto-Magic OpenSolaris Project Page'
+-				uri='http://hub.opensolaris.org/bin/view/Project+nwam/'
+-				/>
+-		</documentation>
+-	</template>
+-
+-	</instance>
+ 
+ 	<stability value='Unstable' />
+ 
diff --git a/smf-base/debian/rules b/smf-base/debian/rules
index dc5ae1c..f66f4f9 100755
--- a/smf-base/debian/rules
+++ b/smf-base/debian/rules
@@ -39,6 +39,8 @@ binary-stamp: patch-stamp
 	dh_testroot
 	dh_installdirs
 	dh_install
+	find debian/smf-base/lib/svc/manifest -type f -name \*.xml -exec \
+		svccfg validate {} \;
 	dh_installman
 	dh_installdocs
 	dh_installexamples