From 3e8c3b95d57b4ab5caca2cc99b412489015c4858 Mon Sep 17 00:00:00 2001
From: Dan McDonald <danmcd@omniti.com>
Date: Mon, 13 Apr 2015 15:27:06 -0400
Subject: [PATCH] 5834 Remove dependency on sysidtool Reviewed by: Richard Lowe
 <richlowe@richlowe.net> Reviewed by: Alexander Pyhalov <alp@rsu.ru> Reviewed
 by: Garrett D'Amore <garrett@damore.org> Approved by: Hans Rosenfeld
 <rosenfeld@grumpf.hope-2000.org>

---
 usr/src/cmd/rpcbind/bind.xml                       | 11 +-------
 usr/src/cmd/svc/milestone/single-user.xml          | 29 +---------------------
 .../pkg/manifests/developer-opensolaris-osnet.mf   |  1 -
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/usr/src/cmd/rpcbind/bind.xml b/usr/src/cmd/rpcbind/bind.xml
index b81c7b49ec..fca29c8993 100644
--- a/usr/src/cmd/rpcbind/bind.xml
+++ b/usr/src/cmd/rpcbind/bind.xml
@@ -22,7 +22,7 @@
     CDDL HEADER END
    
     Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
-
+    Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved.
     Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
     Use is subject to license terms.
 
@@ -53,15 +53,6 @@
 		<service_fmri value='svc:/system/filesystem/minimal' />
 	</dependency>
 
-	<dependency
-		name='sysidtool'
-		grouping='require_all'
-		restart_on='none'
-		type='service'>
-		<service_fmri
-			value='svc:/system/sysidtool:net' />
-	</dependency>
-
 	<!--
 		rpcbind(1M) depends on multicast routes installed by the
 		routing-setup service, and should be started after any IPsec
diff --git a/usr/src/cmd/svc/milestone/single-user.xml b/usr/src/cmd/svc/milestone/single-user.xml
index cbb93fd3b3..8797f13c47 100644
--- a/usr/src/cmd/svc/milestone/single-user.xml
+++ b/usr/src/cmd/svc/milestone/single-user.xml
@@ -3,6 +3,7 @@
 <!--
  Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  Use is subject to license terms.
+ Copyright 2015 OmniTI Computer Consulting, Inc.  All rights reserved.
 
  CDDL HEADER START
 
@@ -24,8 +25,6 @@
 
  CDDL HEADER END
 
-	ident	"%Z%%M%	%I%	%E% SMI"
-
 	NOTE:  This service manifest is not editable; its contents will
 	be overwritten by package or patch operations, including
 	operating system upgrade.  Make customizations in a different
@@ -43,32 +42,6 @@
 
 	<single_instance />
 
-	<!--
-	  Single-user's dependency on sysidtool is obsolete, but instead of
-	  removing it from this manifest, retain it here with its delete
-	  attribute set to true. This is to try and prevent a dependency
-	  cycle with the new sysidtool which declares a dependency on
-	  single-user. This will force the deletion of single-user's
-	  sysidtool dependency as soon as this manifest is imported
-	  (instead of waiting for upgrade to delete it).
-
-	  Note that this does not guarantee the prevention of a dependency
-	  cycle (if the new sysidtool manifest is imported before
-	  single-user's) - if this does occur, the code in upgrade will
-	  catch it - it deletes single-user's dependency and "svcadm
-	  clear"s sysidtool.
-	-->
-
-	<dependency
-		name='sysidtool'
-		grouping='require_all'
-		restart_on='none'
-		type='service'
-		delete='true'>
-		<service_fmri value='svc:/system/sysidtool:net' />
-		<service_fmri value='svc:/system/sysidtool:system' />
-	</dependency>
-
 	<dependency
 		name='nodename'
 		grouping='require_all'
diff --git a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf
index 15b37a4cfe..2ba0b4d332 100644
--- a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf
+++ b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf
@@ -56,7 +56,6 @@ depend fmri=system/library/libdbus-glib@0.5.11-0.133 type=require
 depend fmri=system/library/libdbus@0.5.11-0.133 type=require
 depend fmri=system/library/math/header-math@0.5.11-0.133 type=require
 depend fmri=system/library/mozilla-nss/header-nss@0.5.11-0.133 type=require
-depend fmri=system/management/product-registry@0.5.11-0.133 type=require
 depend fmri=system/management/snmp/net-snmp@5.4.1-0.133 type=require
 depend fmri=text/gnu-gettext@0.16.1-0.133 type=require
 depend fmri=web/server/apache-22 type=require
-- 
2.11.4.GIT