5834 Remove dependency on sysidtool

*** 1,10 ****
--- 1,11 ----
  <?xml version="1.0"?>
  <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
  <!--
   Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
   Use is subject to license terms.
+  Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
  
   CDDL HEADER START
  
   The contents of this file are subject to the terms of the
   Common Development and Distribution License, Version 1.0 only
*** 41,77 ****
  
          <create_default_instance enabled='true' />
  
          <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'
                  restart_on='none'
                  type='service'>
                  <service_fmri value='svc:/system/identity:node' />
--- 42,52 ----