6802884 rdc deliverables are still broken

12 files changed, 28 insertions, 64 deletions

diff --git a/usr/src/cmd/avs/dsw/etc/Makefile b/usr/src/cmd/avs/dsw/etc/Makefile
index f05b374c79..85cedf294b 100644
--- a/usr/src/cmd/avs/dsw/etc/Makefile
+++ b/usr/src/cmd/avs/dsw/etc/Makefile
@@ -49,7 +49,7 @@ install:  $(ROOTINIT_DPROG) $(ROOTINIT_DPROG2) $(CLUSTERSBINDIR) $(ROOTLIBSVCMET
 	-$(SYMLINK) ../../../sbin/ii $(CLUSTERLIBDSCFGSTOPDIR)/20ii
 	-$(SYMLINK) ../../../sbin/ii $(CLUSTERLIBDSCFGSTARTDIR)/05ii
 	$(LN) $(ROOTINIT_D)/ii $(ROOTLIBSVCMETHOD)/svc-ii
-	$(LN) $(ROOTINIT_D)/ii.cluster $(CLUSTERSBINDIR)/ii
+	$(CP) $(ROOTINIT_D)/ii.cluster $(CLUSTERSBINDIR)/ii
 
 $(ROOTINIT_DPROG): ii
 	$(INS.file) ii
diff --git a/usr/src/cmd/avs/rdc/etc/Makefile b/usr/src/cmd/avs/rdc/etc/Makefile
index bf0faf93cd..926bbec7b0 100644
--- a/usr/src/cmd/avs/rdc/etc/Makefile
+++ b/usr/src/cmd/avs/rdc/etc/Makefile
@@ -54,7 +54,7 @@ install: $(ROOTINIT_DPROG1) $(ROOTINIT_DPROG2) $(ROOTINIT_DPROG3) $(ROOTLIBSVCME
 	-$(SYMLINK) ../../../sbin/rdc $(CLUSTERLIBDSCFGSTARTDIR)/10rdc
 	$(LN) $(ROOTINIT_D)/rdc $(ROOTLIBSVCMETHOD)/svc-rdc
 	$(LN) $(ROOTINIT_D)/rdcfinish $(ROOTLIBSVCMETHOD)/svc-rdcsyncd
-	$(LN) $(ROOTINIT_D)/rdc.cluster $(CLUSTERSBINDIR)/rdc
+	$(CP) $(ROOTINIT_D)/rdc.cluster $(CLUSTERSBINDIR)/rdc
 
 $(ROOTINIT_DPROG1): $(PROG1)
 	$(INS.file) $(PROG1)
diff --git a/usr/src/cmd/avs/sv/etc/Makefile b/usr/src/cmd/avs/sv/etc/Makefile
index fce215f71f..97482f8101 100644
--- a/usr/src/cmd/avs/sv/etc/Makefile
+++ b/usr/src/cmd/avs/sv/etc/Makefile
@@ -32,15 +32,15 @@ OWNER = root
 GROUP = sys
 FILEMODE = 0744
 
-ROOTINIT_DPROGS = $(SHFILES:%=$(ROOTINIT_D)/%)
+ROOTINIT_DPROG1 = $(ROOTINIT_D)/sv
+ROOTINIT_DPROG2 = $(ROOTINIT_D)/sv.cluster
 
 .KEEP_STATE:
 
 all:	$(SHFILES)
 
-
-install: $(ROOTINIT_DPROGS) $(CLUSTERSBINDIR) $(CLUSTERLIBSTOPDIR) \
-	 $(CLUSTERLIBSTARTDIR) $(ROOTLIBSVCMETHOD)
+install: all $(ROOTINIT_DPROG1) $(ROOTINIT_DPROG2) $(CLUSTERSBINDIR) \
+	 $(CLUSTERLIBSTOPDIR) $(CLUSTERLIBSTARTDIR) $(ROOTLIBSVCMETHOD)
 	-$(RM) $(CLUSTERLIBDSCFGSTOPDIR)/10sv
 	-$(RM) $(CLUSTERLIBDSCFGSTARTDIR)/15sv
 	-$(RM) $(CLUSTERSBINDIR)/sv
@@ -48,10 +48,13 @@ install: $(ROOTINIT_DPROGS) $(CLUSTERSBINDIR) $(CLUSTERLIBSTOPDIR) \
 	-$(SYMLINK) ../../../sbin/sv $(CLUSTERLIBDSCFGSTOPDIR)/10sv
 	-$(SYMLINK) ../../../sbin/sv $(CLUSTERLIBDSCFGSTARTDIR)/15sv
 	$(LN) $(ROOTINIT_D)/sv $(ROOTLIBSVCMETHOD)/svc-sv
-	$(LN) $(ROOTINIT_D)/sv.cluster $(CLUSTERSBINDIR)/sv
+	$(CP) $(ROOTINIT_D)/sv.cluster $(CLUSTERSBINDIR)/sv
+
+$(ROOTINIT_DPROG1): sv
+	$(INS.file) sv
 
-$(ROOTINIT_D)/%:	%
-	$(INS.file)
+$(ROOTINIT_DPROG2): sv.cluster
+	$(INS.file) sv.cluster
 
 $(CLUSTERLIBSTOPDIR):
 	$(INS.dir)
@@ -65,4 +68,4 @@ clean:
 	$(RM) $(SHFILES)
 
 clobber: clean
-	$(RM) $(ROOTINIT_DPROGS)
+	$(RM) $(ROOTINIT_DPROG1) $(ROOTINIT_DPROG2)
diff --git a/usr/src/cmd/avs/svc/Makefile b/usr/src/cmd/avs/svc/Makefile
index eaf13086ec..ad7a76af1a 100644
--- a/usr/src/cmd/avs/svc/Makefile
+++ b/usr/src/cmd/avs/svc/Makefile
@@ -27,12 +27,6 @@ include ../../Makefile.cmd
 XML = nws_scm.xml nws_sv.xml nws_ii.xml nws_rdc.xml nws_rdcsyncd.xml
 SHFILES = $(XML)
 
-all	:=	TARGET= all
-install	:=	TARGET= install
-clean	:=	TARGET= clean
-clobber	:=	TARGET= clobber
-lint	:=	TARGET= lint
-
 ROOTSVCSYSFILES = $(XML:%=$(ROOTSVCSYSTEM)/%)
 
 .KEEP_STATE:
@@ -43,7 +37,7 @@ all:	$(SHFILES)
 
 lint:
 
-install: all $(ROOTLIBSHFILES) $(ROOTSVCSYSFILES)
+install: all $(ROOTSVCSYSFILES)
 
 clean:
 	$(RM) *.xml
@@ -56,12 +50,7 @@ OWNER = root
 GROUP = sys
 FILEMODE = 0444
 
-$(ROOTLIBSHFILES): $(SHFILES)
-	$(INS.file)  $(@F)
-
-$(ROOTSVCSYSFILES): $(SHFILES) $(ROOTLIBSHFILES)
-	-$(RM) $@; $(LN) $(@F:%=$(ROOTLIB)/%) $@
+$(ROOTSVCSYSFILES): $(SHFILES)
 
-FRC:
 
 include ../../Makefile.targ
diff --git a/usr/src/pkgdefs/SUNWiir/prototype_com b/usr/src/pkgdefs/SUNWiir/prototype_com
index 8db4aa6cab..3bb8d97e2b 100644
--- a/usr/src/pkgdefs/SUNWiir/prototype_com
+++ b/usr/src/pkgdefs/SUNWiir/prototype_com
@@ -41,6 +41,7 @@ i r.manifest
 d none etc 0755 root sys
 d none etc/init.d 0755 root sys
 f none etc/init.d/ii 0744 root bin
+f none etc/init.d/ii.cluster 0744 root bin
 
 d none lib 755 root bin
 d none lib/svc 755 root bin
@@ -50,12 +51,8 @@ l none lib/svc/method/svc-ii=../../../etc/init.d/ii
 d none kernel 0755 root sys
 d none kernel/kmdb 755 root sys
 
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-f none usr/lib/nws_ii.xml 0444 root sys
-
 d none var 755 root sys
 d none var/svc 755 root sys
 d none var/svc/manifest 755 root sys
 d none var/svc/manifest/system 755 root sys
-l manifest var/svc/manifest/system/nws_ii.xml=../../../../usr/lib/nws_ii.xml
+f manifest var/svc/manifest/system/nws_ii.xml 0444 root sys
diff --git a/usr/src/pkgdefs/SUNWiiu/prototype_com b/usr/src/pkgdefs/SUNWiiu/prototype_com
index fda389d72f..c4c2de1cdb 100644
--- a/usr/src/pkgdefs/SUNWiiu/prototype_com
+++ b/usr/src/pkgdefs/SUNWiiu/prototype_com
@@ -60,16 +60,12 @@ s none usr/sbin/iiadm=../bin/iiadm
 s none usr/sbin/iicpbmp=../bin/iicpbmp
 s none usr/sbin/iicpshd=../bin/iicpshd
 
-d none etc 0755 root sys
-d none etc/init.d 0755 root sys
-f none etc/init.d/ii.cluster 0744 root bin
-
 d none usr/cluster 0755 root sys
 d none usr/cluster/lib 0755 root bin
 d none usr/cluster/lib/dscfg 0755 root bin
 d none usr/cluster/lib/dscfg/start 0755 root bin
 d none usr/cluster/lib/dscfg/stop 0755 root bin
 d none usr/cluster/sbin 0755 root other
-l none usr/cluster/sbin/ii=../../../etc/init.d/ii.cluster
+f none usr/cluster/sbin/ii 0744 root bin
 s none usr/cluster/lib/dscfg/start/05ii=../../../sbin/ii
 s none usr/cluster/lib/dscfg/stop/20ii=../../../sbin/ii
diff --git a/usr/src/pkgdefs/SUNWrdcr/prototype_com b/usr/src/pkgdefs/SUNWrdcr/prototype_com
index 4337e18c8f..8117eebe5c 100644
--- a/usr/src/pkgdefs/SUNWrdcr/prototype_com
+++ b/usr/src/pkgdefs/SUNWrdcr/prototype_com
@@ -41,6 +41,7 @@ d none etc 0755 root sys
 d none etc/init.d 0755 root sys
 f none etc/init.d/rdc 0744 root bin
 f none etc/init.d/rdcfinish 0744 root bin
+f none etc/init.d/rdc.cluster 0744 root bin
 
 d none lib 0755 root bin
 d none lib/svc 0755 root bin
@@ -51,14 +52,9 @@ l none lib/svc/method/svc-rdcsyncd=../../../etc/init.d/rdcfinish
 d none kernel 0755 root sys
 d none kernel/kmdb 755 root sys
 
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-f none usr/lib/nws_rdc.xml 0444 root sys
-f none usr/lib/nws_rdcsyncd.xml 0444 root sys
-
 d none var 0755 root sys
 d none var/svc 0755 root sys
 d none var/svc/manifest 0755 root sys
 d none var/svc/manifest/system 0755 root sys
-l manifest var/svc/manifest/system/nws_rdc.xml=../../../../usr/lib/nws_rdc.xml
-l manifest var/svc/manifest/system/nws_rdcsyncd.xml=../../../../usr/lib/nws_rdcsyncd.xml
+f manifest var/svc/manifest/system/nws_rdc.xml 0444 root sys
+f manifest var/svc/manifest/system/nws_rdcsyncd.xml 0444 root sys
diff --git a/usr/src/pkgdefs/SUNWrdcu/prototype_com b/usr/src/pkgdefs/SUNWrdcu/prototype_com
index f735dc2d9e..a4412cdc5d 100644
--- a/usr/src/pkgdefs/SUNWrdcu/prototype_com
+++ b/usr/src/pkgdefs/SUNWrdcu/prototype_com
@@ -64,16 +64,12 @@ l none usr/sbin/sndradm=../bin/sndradm 0555 root bin
 l none usr/lib/sndrd=../bin/sndrd
 l none usr/lib/sndrsyncd=../bin/sndrsyncd
 
-d none etc 0755 root sys
-d none etc/init.d 0755 root sys
-f none etc/init.d/rdc.cluster 0744 root bin
-
 d none usr/cluster 0755 root sys
 d none usr/cluster/lib 0755 root bin
 d none usr/cluster/lib/dscfg 0755 root bin
 d none usr/cluster/lib/dscfg/start 0755 root bin
 d none usr/cluster/lib/dscfg/stop 0755 root bin
 d none usr/cluster/sbin 0755 root other
-l none usr/cluster/sbin/rdc=../../../etc/init.d/rdc.cluster
+f none usr/cluster/sbin/rdc 0744 root bin
 s none usr/cluster/lib/dscfg/start/10rdc=../../../sbin/rdc
 s none usr/cluster/lib/dscfg/stop/15rdc=../../../sbin/rdc
diff --git a/usr/src/pkgdefs/SUNWscmr/prototype_com b/usr/src/pkgdefs/SUNWscmr/prototype_com
index f00a332dab..1628166905 100644
--- a/usr/src/pkgdefs/SUNWscmr/prototype_com
+++ b/usr/src/pkgdefs/SUNWscmr/prototype_com
@@ -52,12 +52,8 @@ l none lib/svc/method/svc-scm=../../../etc/init.d/scm
 d none kernel 0755 root sys
 d none kernel/kmdb 755 root sys
 
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-f none usr/lib/nws_scm.xml 0444 root sys
-
 d none var 0755 root sys
 d none var/svc 0755 root sys
 d none var/svc/manifest 0755 root sys
 d none var/svc/manifest/system 0755 root sys
-l manifest var/svc/manifest/system/nws_scm.xml=../../../../usr/lib/nws_scm.xml
+f manifest var/svc/manifest/system/nws_scm.xml 0444 root sys
diff --git a/usr/src/pkgdefs/SUNWspsvr/prototype_com b/usr/src/pkgdefs/SUNWspsvr/prototype_com
index fa608466d4..c109ce0c1e 100644
--- a/usr/src/pkgdefs/SUNWspsvr/prototype_com
+++ b/usr/src/pkgdefs/SUNWspsvr/prototype_com
@@ -42,6 +42,7 @@ i r.manifest
 d none etc 0755 root sys
 d none etc/init.d 0755 root sys
 f none etc/init.d/sv 0744 root bin
+f none etc/init.d/sv.cluster 0744 root bin
 
 d none lib 0755 root bin
 d none lib/svc 0755 root bin
@@ -51,13 +52,9 @@ l none lib/svc/method/svc-sv=../../../etc/init.d/sv
 d none kernel 0755 root sys
 d none kernel/kmdb 755 root sys
 
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-f none usr/lib/nws_sv.xml 0444 root sys
-
 # SMF service
 d none var 0755 root sys
 d none var/svc 0755 root sys
 d none var/svc/manifest 0755 root sys
 d none var/svc/manifest/system 0755 root sys
-l manifest var/svc/manifest/system/nws_sv.xml=../../../../usr/lib/nws_sv.xml
+f manifest var/svc/manifest/system/nws_sv.xml 0444 root sys
diff --git a/usr/src/pkgdefs/SUNWspsvu/prototype_com b/usr/src/pkgdefs/SUNWspsvu/prototype_com
index b8c6095ba4..0e8aeaa6bf 100644
--- a/usr/src/pkgdefs/SUNWspsvu/prototype_com
+++ b/usr/src/pkgdefs/SUNWspsvu/prototype_com
@@ -54,16 +54,13 @@ d none usr/sbin 0755 root bin
 l none usr/sbin/svadm=../bin/svadm
 l none usr/sbin/svboot=../bin/svboot
 
-d none etc 0755 root sys
-d none etc/init.d 0755 root sys
-f none etc/init.d/sv.cluster 0744 root bin
-
 d none usr/cluster 0755 root sys
 d none usr/cluster/lib 0755 root bin
 d none usr/cluster/lib/dscfg 0755 root bin
 d none usr/cluster/lib/dscfg/start 0755 root bin
 d none usr/cluster/lib/dscfg/stop 0755 root bin
+
 d none usr/cluster/sbin 0755 root other
-l none usr/cluster/sbin/sv=../../../etc/init.d/sv.cluster
+f none usr/cluster/sbin/sv 0744 root bin
 s none usr/cluster/lib/dscfg/start/15sv=../../../sbin/sv
 s none usr/cluster/lib/dscfg/stop/10sv=../../../sbin/sv
diff --git a/usr/src/uts/common/avs/ns/rdc/rdc_stub.c b/usr/src/uts/common/avs/ns/rdc/rdc_stub.c
index 7f702386c1..c1ef2dc502 100644
--- a/usr/src/uts/common/avs/ns/rdc/rdc_stub.c
+++ b/usr/src/uts/common/avs/ns/rdc/rdc_stub.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -107,7 +107,4 @@ void
 rdcstub_unset_dispatch()
 {
 	dispatch = null_dispatch;
-#ifdef DEBUG
-	cmn_err(CE_NOTE, "SNDR RPC dispatch is set to null");
-#endif
 }