6790771 rdc deliverables are broken

32 files changed, 266 insertions, 96 deletions

diff --git a/usr/src/cmd/avs/Makefile b/usr/src/cmd/avs/Makefile
index 4ab75afa3a..18c07e24d6 100644
--- a/usr/src/cmd/avs/Makefile
+++ b/usr/src/cmd/avs/Makefile
@@ -18,7 +18,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.
 #
 #
@@ -56,6 +56,7 @@ _msg:		$(MSGSUBDIRS)
 
 install: 	$(CLUSTERDIR) \
 		$(CLUSTERLIBDIR) \
+		$(CLUSTERSBINDIR) \
 		$(CLUSTERLIBDSCFGDIR) \
 		$(CLUSTERLIBDSCFGSTOPDIR) \
 		$(CLUSTERLIBDSCFGSTARTDIR) \
diff --git a/usr/src/cmd/avs/Makefile.com b/usr/src/cmd/avs/Makefile.com
index b6717e3fba..b6ea49214b 100644
--- a/usr/src/cmd/avs/Makefile.com
+++ b/usr/src/cmd/avs/Makefile.com
@@ -18,13 +18,13 @@
 # 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.
 #
 # cmd/avs/Makefile.com
 #
 CLUSTERDIR = $(ROOT)/usr/cluster
-CLUSTERSBIN = $(CLUSTERDIR)/sbin
+CLUSTERSBINDIR = $(CLUSTERDIR)/sbin
 CLUSTERLIBDIR = $(CLUSTERDIR)/lib
 CLUSTERLIBDSCFGDIR = $(CLUSTERLIBDIR)/dscfg
 CLUSTERLIBSTOPDIR = $(CLUSTERLIBDIR)/stop
diff --git a/usr/src/cmd/avs/dsbitmap/Makefile b/usr/src/cmd/avs/dsbitmap/Makefile
index 20bddd3971..b00d148bf6 100644
--- a/usr/src/cmd/avs/dsbitmap/Makefile
+++ b/usr/src/cmd/avs/dsbitmap/Makefile
@@ -18,7 +18,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.
 #
 
@@ -39,6 +39,7 @@ CFLAGS += -v
 LDLIBS += -lunistat -ladm
 LINTFLAGS +=	-Xa -n -s -x -m -u -Dlint -errhdr=%user
 LINTFLAGS +=	-erroff=E_SEC_PRINTF_VAR_FMT
+ROOTLINK = $(ROOTUSRSBIN)/$(PROG)
 
 all	:=	TARGET= all
 install	:=	TARGET= install
@@ -52,7 +53,7 @@ lint	:=	TARGET= lint
 
 all:	$(PROG)
 
-install: all $(ROOTPROG)
+install: all $(ROOTPROG) $(ROOTLINK)
 
 lint:	lint_SRCS
 
@@ -66,6 +67,9 @@ $(PROG): $$(POBJS)
 check:	$(PROG).c
 	$(CSTYLE) -pP $(SRCS:%=%)
 
+$(ROOTLINK): $(ROOTBIN)/$(PROG) $(ROOTUSRSBIN)
+	-$(RM) $@; $(LN) $(ROOTBIN)/$(PROG) $@
+
 FRC:
 
 include ../../Makefile.targ
diff --git a/usr/src/cmd/avs/dscfg/Makefile b/usr/src/cmd/avs/dscfg/Makefile
index 13870e9586..78f6879106 100644
--- a/usr/src/cmd/avs/dscfg/Makefile
+++ b/usr/src/cmd/avs/dscfg/Makefile
@@ -18,7 +18,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.
 #
 
@@ -47,6 +47,8 @@ LINTFLAGS += -erroff=E_FUNC_RET_MAYBE_IGNORED2
 LINTFLAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2
 LINTDIR = $(KBASE)/lintdir
 LFILE = $(LINTDIR)/dscfg.ln
+ROOTLINK = $(ROOTUSRSBIN)/$(PROG)
+ROOTSHLINK = $(ROOTUSRSBIN)/$(SHFILES)
 
 all	:=	TARGET= all
 install	:=	TARGET= install
@@ -56,7 +58,7 @@ lint	:=	TARGET= lint
 
 all: $(SUBDIRS) $(PROG) $(SHFILES)
 
-install: $(SUBDIRS) all $(ROOTSHFILES) $(ROOTPROG)
+install: $(SUBDIRS) all $(ROOTSHFILES) $(ROOTPROG) $(ROOTLINK) $(ROOTSHLINK)
 
 lint:	$(SUBDIRS) lint_PROG
 
@@ -66,6 +68,12 @@ clean:	$(SUBDIRS)
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
+$(ROOTLINK):	$(ROOTUSRSBIN) $(ROOTPROG)
+	-$(RM) $@; $(LN) $(ROOTPROG) $@
+
+$(ROOTSHLINK):	$(ROOTUSRSBIN) $(ROOTSHFILES)
+	-$(RM) $@; $(LN) $(ROOTSHFILES) $@
+
 FRC:
 
 include	../../Makefile.targ
diff --git a/usr/src/cmd/avs/dscfglockd/Makefile b/usr/src/cmd/avs/dscfglockd/Makefile
index 5f5a38e472..08c1a0a171 100644
--- a/usr/src/cmd/avs/dscfglockd/Makefile
+++ b/usr/src/cmd/avs/dscfglockd/Makefile
@@ -18,7 +18,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.
 #
 
@@ -46,6 +46,7 @@ LINTFLAGS += -DDEBUG -erroff=E_SEC_SCANF_UNBOUNDED_COPY
 LINTDIR = $(KBASE)/lintdir
 POFILE = dscfglockd_all.po
 LFILE = $(LINTDIR)/rdc.ln
+ROOTLINK = $(ROOTLIB)/dscfglockd
 
 all	:=	TARGET= all
 install	:=	TARGET= install
@@ -59,7 +60,7 @@ lint	:=	TARGET= lint
 
 all: $(SUBDIRS) $(PROG) $(POFILES)
 
-install: $(SUBDIRS) all $(ROOTPROG)
+install: $(SUBDIRS) all $(ROOTPROG) $(ROOTLINK)
 
 lint:	$(SUBDIRS) lint_SRCS
 
@@ -74,6 +75,9 @@ $(PROG):	$$(POBJS)
 	$(LINK.c) $(POBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
+$(ROOTLINK):	$(ROOTLIB) $(ROOTBIN)/dscfglockd
+	-$(RM) $@; $(LN) $(ROOTBIN)/dscfglockd $@
+
 FRC:
 
 include	../../Makefile.targ
diff --git a/usr/src/cmd/avs/dsstat/Makefile b/usr/src/cmd/avs/dsstat/Makefile
index 22f051e238..1f3349bf2b 100644
--- a/usr/src/cmd/avs/dsstat/Makefile
+++ b/usr/src/cmd/avs/dsstat/Makefile
@@ -18,7 +18,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.
 #
 #
@@ -47,6 +47,7 @@ LINTDIR = $(KBASE)/lintdir
 POFILE = dsstat_all.po
 POFILES = $(OBJS:%.o=%.po)
 LFILE = $(LINTDIR)/dsstat.ln
+ROOTLINK = $(ROOTUSRSBIN)/$(PROG)
 
 all	:=	TARGET= all
 install	:=	TARGET= install
@@ -60,7 +61,7 @@ lint	:=	TARGET= lint
 
 all: $(SUBDIRS) $(PROG)
 
-install: $(SUBDIRS) all $(ROOTPROG)
+install: $(SUBDIRS) all $(ROOTPROG) $(ROOTLINK)
 
 lint:	$(SUBDIRS) lint_SRCS
 
@@ -78,6 +79,9 @@ $(POFILE): $(POFILES)
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
+$(ROOTLINK): $(ROOTUSRSBIN) $(ROOTPROG)
+	-$(RM) $@; $(LN) $(ROOTPROG) $@
+
 FRC:
 
 include	../../Makefile.targ
diff --git a/usr/src/cmd/avs/dsw/etc/Makefile b/usr/src/cmd/avs/dsw/etc/Makefile
index d53409a2de..f05b374c79 100644
--- a/usr/src/cmd/avs/dsw/etc/Makefile
+++ b/usr/src/cmd/avs/dsw/etc/Makefile
@@ -18,7 +18,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.
 #
 
@@ -41,11 +41,15 @@ ROOTINIT_DPROG2= $(ROOTINIT_D)/ii.cluster
 
 all:	$(SHFILES)
 
-install:  $(ROOTINIT_DPROG) $(ROOTINIT_DPROG2)
+install:  $(ROOTINIT_DPROG) $(ROOTINIT_DPROG2) $(CLUSTERSBINDIR) $(ROOTLIBSVCMETHOD)
 	-$(RM) $(CLUSTERLIBDSCFGSTOPDIR)/20ii
 	-$(RM) $(CLUSTERLIBDSCFGSTARTDIR)/05ii
+	-$(RM) $(CLUSTERSBINDIR)/ii
+	-$(RM) $(ROOTLIBSVCMETHOD)/svc-ii
 	-$(SYMLINK) ../../../sbin/ii $(CLUSTERLIBDSCFGSTOPDIR)/20ii
 	-$(SYMLINK) ../../../sbin/ii $(CLUSTERLIBDSCFGSTARTDIR)/05ii
+	$(LN) $(ROOTINIT_D)/ii $(ROOTLIBSVCMETHOD)/svc-ii
+	$(LN) $(ROOTINIT_D)/ii.cluster $(CLUSTERSBINDIR)/ii
 
 $(ROOTINIT_DPROG): ii
 	$(INS.file) ii
diff --git a/usr/src/cmd/avs/ncall/Makefile b/usr/src/cmd/avs/ncall/Makefile
index 912eccf8fb..c9c6d78735 100644
--- a/usr/src/cmd/avs/ncall/Makefile
+++ b/usr/src/cmd/avs/ncall/Makefile
@@ -18,7 +18,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.
 #
 #
@@ -47,6 +47,7 @@ LINTFLAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2
 LINTFLAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2
 LINTDIR = $(KBASE)/lintdir
 CFLAGS += -v -D_SYSCALL32 -D__NCALL__
+ROOTLINK = $(ROOTLIB)/$(PROG)
 
 all	:=	TARGET= all
 install	:=	TARGET= install
@@ -60,7 +61,7 @@ lint	:=	TARGET= lint
 
 all:	$(SUBDIRS)$(PROG) $(POFILE)
 
-install: $(SUBDIRS) all $(ROOTPROG)
+install: $(SUBDIRS) all $(ROOTPROG) $(ROOTLINK)
 
 lint:	$(SUBDIRS) lint_SRCS
 
@@ -74,6 +75,9 @@ $(PROG):	$$(POBJS)
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
+$(ROOTLINK): $(ROOTLIB) $(ROOTPROG)
+	-$(RM) $@; $(LN) $(ROOTPROG) $@
+
 FRC:
 
 include ../../Makefile.targ
diff --git a/usr/src/cmd/avs/nsctl/Makefile b/usr/src/cmd/avs/nsctl/Makefile
index a1a42e9c19..f5b19dc7b2 100644
--- a/usr/src/cmd/avs/nsctl/Makefile
+++ b/usr/src/cmd/avs/nsctl/Makefile
@@ -18,7 +18,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.
 #
 
@@ -45,6 +45,8 @@ LINTFLAGS += -Xa -n -s -x -m -u -Dlint -errhdr=%user -DDEBUG
 LINTDIR = $(KBASE)/lintdir
 POFILE = nsctl_all.po
 LFILE = $(LINTDIR)/nsctl.ln
+ROOTLIBLINK = $(ROOTLIB)/nskernd
+ROOTSBINLINK = $(ROOTUSRSBIN)/nscadm
 
 all	:=	TARGET= all
 install	:=	TARGET= install
@@ -61,7 +63,7 @@ nskernd	:=	LDLIBS += $(NSKERND_LDLIBS)
 
 all: $(PROG) $(POFILES)
 
-install: all $(ROOTPROG) $(ROOTBIN)/nskernd
+install: all $(ROOTPROG) $(ROOTBIN)/nskernd $(ROOTLIBLINK) $(ROOTSBINLINK)
 
 lint:	lint_SRCS
 
@@ -76,4 +78,10 @@ $(POFILE): $(POFILES)
 	$(RM) $@
 	$(CAT) $(POFILES) > $@
 
+$(ROOTLIBLINK): $(ROOTLIB) $(ROOTBIN)/nskernd
+	-$(RM) $@; $(LN) $(ROOTBIN)/nskernd $@
+
+$(ROOTSBINLINK): $(ROOTUSRSBIN) $(ROOTPROG)
+	-$(RM) $@; $(LN) $(ROOTBIN)/nscadm $@
+
 include	../../Makefile.targ
diff --git a/usr/src/cmd/avs/rdc/Makefile b/usr/src/cmd/avs/rdc/Makefile
index d242539621..92c2586136 100644
--- a/usr/src/cmd/avs/rdc/Makefile
+++ b/usr/src/cmd/avs/rdc/Makefile
@@ -18,7 +18,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.
 #
 #
@@ -64,6 +64,8 @@ LINTFLAGS += -erroff=E_SEC_PRINTF_VAR_FMT
 LINTFLAGS += -erroff=E_FUNC_SET_NOT_USED
 POFILE = rdc_all.po
 POFILES = sndradm.po sndrboot.po
+ROOTLIBLINKS = $(ROOTLIB)/sndrd $(ROOTLIB)/sndrsyncd
+ROOTUSRSBINLINKS = $(ROOTUSRSBIN)/sndradm $(ROOTUSRSBIN)/sndrboot
 
 all	:=	TARGET= all
 install	:=	TARGET= install
@@ -77,7 +79,7 @@ lint	:=	TARGET= lint
 
 all: $(SUBDIRS) $(PROG) $(POFILES)
 
-install: $(SUBDIRS) all $(ROOTPROG)
+install: $(SUBDIRS) all $(ROOTPROG) $(ROOTLIBLINKS) $(ROOTUSRSBINLINKS)
 
 lint:	$(SUBDIRS) lint_SRCS
 
@@ -98,6 +100,16 @@ sdbc_ioctl.o: ../sdbc/sdbc_ioctl.c
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
+$(ROOTLIBLINKS): $(ROOTLIB) $(ROOTPROG)
+	-$(RM) $(ROOTLIBLINKS);
+	$(LN) $(ROOTBIN)/sndrd $(ROOTLIB)/sndrd;
+	$(LN) $(ROOTBIN)/sndrsyncd $(ROOTLIB)/sndrsyncd
+
+$(ROOTUSRSBINLINKS): $(ROOTUSRSBIN) $(ROOTPROG)
+	-$(RM) $(ROOTUSRSBINLINKS);
+	$(LN) $(ROOTBIN)/sndradm $(ROOTUSRSBIN)/sndradm;
+	$(LN) $(ROOTBIN)/sndrboot $(ROOTUSRSBIN)/sndrboot
+
 FRC:
 
 include	../../Makefile.targ
diff --git a/usr/src/cmd/avs/rdc/etc/Makefile b/usr/src/cmd/avs/rdc/etc/Makefile
index c4d1a8138d..bf0faf93cd 100644
--- a/usr/src/cmd/avs/rdc/etc/Makefile
+++ b/usr/src/cmd/avs/rdc/etc/Makefile
@@ -18,7 +18,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.
 #
 include ../../../Makefile.cmd
@@ -44,11 +44,17 @@ ROOTINIT_DPROG3 = $(ROOTINIT_D)/$(PROG3)
 
 all:	$(SHFILES) $(ETCFILES) $(INITFILES)
 
-install: $(ROOTINIT_DPROG1) $(ROOTINIT_DPROG2) $(ROOTINIT_DPROG3)
+install: $(ROOTINIT_DPROG1) $(ROOTINIT_DPROG2) $(ROOTINIT_DPROG3) $(ROOTLIBSVCMETHOD) $(CLUSTERSBINDIR)
 	-$(RM) $(CLUSTERLIBDSCFGSTOPDIR)/15rdc
 	-$(RM) $(CLUSTERLIBDSCFGSTARTDIR)/10rdc
+	-$(RM) $(ROOTLIBSVCMETHOD)/svc-rdc
+	-$(RM) $(ROOTLIBSVCMETHOD)/svc-rdcsyncd
+	-$(RM) $(CLUSTERSBINDIR)/rdc
 	-$(SYMLINK) ../../../sbin/rdc $(CLUSTERLIBDSCFGSTOPDIR)/15rdc
 	-$(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
 
 $(ROOTINIT_DPROG1): $(PROG1)
 	$(INS.file) $(PROG1)
diff --git a/usr/src/cmd/avs/sdbc/Makefile b/usr/src/cmd/avs/sdbc/Makefile
index 4f3acb163a..d14f03cb96 100644
--- a/usr/src/cmd/avs/sdbc/Makefile
+++ b/usr/src/cmd/avs/sdbc/Makefile
@@ -18,7 +18,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.
 #
 #
@@ -68,6 +68,7 @@ LINTFLAGS +=	-erroff=E_SEC_SPRINTF_UNBOUNDED_COPY
 LINTFLAGS +=	-erroff=E_SEC_SCANF_UNBOUNDED_COPY
 LINTFLAGS +=	-erroff=E_SEC_FORBIDDEN_WARN_ASCFTIME
 LINTFLAGS +=	-DDEBUG
+ROOTLINK = $(ROOTUSRSBIN)/scmadm
 
 all	:=	TARGET= all
 install	:=	TARGET= install
@@ -81,7 +82,7 @@ lint	:=	TARGET= lint
 
 all:	$(SUBDIRS) $(PROG) $(POFILE)
 
-install: $(SUBDIRS) all $(ROOTPROG)
+install: $(SUBDIRS) all $(ROOTPROG) $(ROOTLINK)
 
 lint:	$(SUBDIRS) lint_SRCS
 
@@ -98,6 +99,9 @@ $(PROG):	$$(POBJS)
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
+$(ROOTLINK): $(ROOTUSRSBIN) $(ROOTBIN)/scmadm
+	-$(RM) $@; $(LN) $(ROOTBIN)/scmadm $@
+
 include ../../Makefile.targ
 
 FRC:
diff --git a/usr/src/cmd/avs/sdbc/etc/Makefile b/usr/src/cmd/avs/sdbc/etc/Makefile
index 2180814281..9e06b50db8 100644
--- a/usr/src/cmd/avs/sdbc/etc/Makefile
+++ b/usr/src/cmd/avs/sdbc/etc/Makefile
@@ -18,12 +18,13 @@
 # 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.
 #
 # cmd/ns/sdbc/etc/Makefile
 
 include ../../../Makefile.cmd
+include ../../Makefile.com
 
 INITPROGS = scm
 BINPROGS = dscfg_reconfigure.cluster
@@ -45,7 +46,11 @@ $(ROOTBINPROGS) := FILEMODE= 555
 
 all:	$(SHFILES) $(INITPROGS) $(BINPROGS)
 
-install: $(ROOTBINPROGS) $(ROOTINITPROGS)
+install: $(ROOTBINPROGS) $(ROOTINITPROGS) $(ROOTLIBSVCMETHOD) $(CLUSTERSBINDIR)
+	-$(RM) $(ROOTLIBSVCMETHOD)/svc-scm
+	-$(RM) $(CLUSTERSBINDIR)/dscfg_reconfigure
+	$(LN) $(ROOTINIT_D)/scm $(ROOTLIBSVCMETHOD)/svc-scm
+	$(LN) $(ROOTBIN)/$(BINPROGS) $(CLUSTERSBINDIR)/dscfg_reconfigure
 
 $(ROOTINIT_D)/%: %
 	$(INS.file)
diff --git a/usr/src/cmd/avs/sv/Makefile b/usr/src/cmd/avs/sv/Makefile
index 945a294264..150d63e925 100644
--- a/usr/src/cmd/avs/sv/Makefile
+++ b/usr/src/cmd/avs/sv/Makefile
@@ -18,7 +18,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.
 #
 
@@ -47,6 +47,8 @@ CFLAGS += -v
 LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
 LINTFLAGS += -erroff=E_SEC_SCANF_UNBOUNDED_COPY
 LINTFLAGS += -erroff=E_SEC_PRINTF_VAR_FMT
+ROOTLINK1 = $(ROOTUSRSBIN)/svadm
+ROOTLINK2 = $(ROOTUSRSBIN)/svboot
 
 all	:=	TARGET= all
 install	:=	TARGET= install
@@ -60,7 +62,7 @@ lint	:=	TARGET= lint
 
 all:	$(SUBDIRS) $(PROG) $(POFILES) 
 
-install: $(SUBDIRS) all $(ROOTPROG)
+install: $(SUBDIRS) all $(ROOTPROG) $(ROOTLINK1) $(ROOTLINK2)
 
 lint:	$(SUBDIRS) $(LPROG)
 
@@ -81,6 +83,12 @@ $(SUBDIRS):	FRC
 $(LPROG):
 	$(LINT.c) $(@:%.li=%.c) $(LDLIBS)
 
+$(ROOTLINK1):	$(ROOTUSRSBIN) $(ROOTPROG)
+	-$(RM) $@; $(LN) $(ROOTBIN)/svadm $@
+
+$(ROOTLINK2):	$(ROOTUSRSBIN) $(ROOTPROG)
+	-$(RM) $@; $(LN) $(ROOTBIN)/svboot $@
+
 FRC:
 
 include ../../Makefile.targ
diff --git a/usr/src/cmd/avs/sv/etc/Makefile b/usr/src/cmd/avs/sv/etc/Makefile
index 314f83fd52..fce215f71f 100644
--- a/usr/src/cmd/avs/sv/etc/Makefile
+++ b/usr/src/cmd/avs/sv/etc/Makefile
@@ -18,7 +18,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.
 #
 
@@ -39,19 +39,20 @@ ROOTINIT_DPROGS = $(SHFILES:%=$(ROOTINIT_D)/%)
 all:	$(SHFILES)
 
 
-install: $(ROOTINIT_DPROGS) $(CLUSTERSBIN) $(CLUSTERLIBSTOPDIR) \
-	 $(CLUSTERLIBSTARTDIR)
+install: $(ROOTINIT_DPROGS) $(CLUSTERSBINDIR) $(CLUSTERLIBSTOPDIR) \
+	 $(CLUSTERLIBSTARTDIR) $(ROOTLIBSVCMETHOD)
 	-$(RM) $(CLUSTERLIBDSCFGSTOPDIR)/10sv
 	-$(RM) $(CLUSTERLIBDSCFGSTARTDIR)/15sv
+	-$(RM) $(CLUSTERSBINDIR)/sv
+	-$(RM) $(ROOTLIBSVCMETHOD)/svc-sv
 	-$(SYMLINK) ../../../sbin/sv $(CLUSTERLIBDSCFGSTOPDIR)/10sv
 	-$(SYMLINK) ../../../sbin/sv $(CLUSTERLIBDSCFGSTARTDIR)/15sv
+	$(LN) $(ROOTINIT_D)/sv $(ROOTLIBSVCMETHOD)/svc-sv
+	$(LN) $(ROOTINIT_D)/sv.cluster $(CLUSTERSBINDIR)/sv
 
 $(ROOTINIT_D)/%:	%
 	$(INS.file)
 
-$(CLUSTERSBIN):
-	$(INS.dir)
-
 $(CLUSTERLIBSTOPDIR):
 	$(INS.dir)
 
diff --git a/usr/src/cmd/avs/svc/Makefile b/usr/src/cmd/avs/svc/Makefile
index da1753b580..787e64ae50 100644
--- a/usr/src/cmd/avs/svc/Makefile
+++ b/usr/src/cmd/avs/svc/Makefile
@@ -18,7 +18,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.
 #
 
@@ -33,6 +33,8 @@ clean	:=	TARGET= clean
 clobber	:=	TARGET= clobber
 lint	:=	TARGET= lint
 
+ROOTSVCSYSFILES = $(XML:%=$(ROOTSVCSYSTEM)/%)
+
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
@@ -41,14 +43,14 @@ all:	$(SHFILES)
 
 lint:
 
-install: all $(ROOTLIBSHFILES)
+install: all $(ROOTLIBSHFILES) $(ROOTSVCSYSFILES)
 
 clean:
 	$(RM) *.xml
 
 $(SHFILES): $(XML:%=manifest/%)
-	rm -f  $(@F)
-	cp  $(@F:%=manifest/%) .
+	$(RM) $(@F)
+	$(CP) $(@F:%=manifest/%) .
 
 OWNER = root
 GROUP = sys
@@ -56,6 +58,10 @@ FILEMODE = 0444
 
 $(ROOTLIBSHFILES): $(SHFILES)
 	$(INS.file)  $(@F)
+
+$(ROOTSVCSYSFILES): $(SHFILES)
+	-$(RM) $@; $(LN) $(@F:%=$(ROOTLIB)/%) $@
+
 FRC:
 
 include ../../Makefile.targ
diff --git a/usr/src/pkgdefs/SUNWiir/prototype_com b/usr/src/pkgdefs/SUNWiir/prototype_com
index 3bcb18f163..8db4aa6cab 100644
--- a/usr/src/pkgdefs/SUNWiir/prototype_com
+++ b/usr/src/pkgdefs/SUNWiir/prototype_com
@@ -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.
 #
 # This required package information file contains a list of package contents.
@@ -37,16 +37,25 @@ i pkginfo
 i depend
 i i.manifest
 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
+
 d none lib 755 root bin
 d none lib/svc 755 root bin
 d none lib/svc/method 755 root bin
-f none lib/svc/method/svc-ii=etc/init.d/ii 0744 root bin
+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
-f manifest var/svc/manifest/system/nws-ii.xml=usr/lib/nws_ii.xml 0444 root sys
+l manifest var/svc/manifest/system/nws_ii.xml=../../../../usr/lib/nws_ii.xml
diff --git a/usr/src/pkgdefs/SUNWiiu/prototype_com b/usr/src/pkgdefs/SUNWiiu/prototype_com
index d735d214f8..fda389d72f 100644
--- a/usr/src/pkgdefs/SUNWiiu/prototype_com
+++ b/usr/src/pkgdefs/SUNWiiu/prototype_com
@@ -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.
 #
 # This required package information file contains a list of package contents.
@@ -60,12 +60,16 @@ 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
-f none usr/cluster/sbin/ii=etc/init.d/ii.cluster 0744 root bin
+l none usr/cluster/sbin/ii=../../../etc/init.d/ii.cluster
 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 1db04a8058..4337e18c8f 100644
--- a/usr/src/pkgdefs/SUNWrdcr/prototype_com
+++ b/usr/src/pkgdefs/SUNWrdcr/prototype_com
@@ -18,7 +18,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.
 #
 # This required package information file contains a list of package contents.
@@ -37,18 +37,28 @@ i depend
 i i.manifest
 i r.manifest
 
+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
+
 d none lib 0755 root bin
 d none lib/svc 0755 root bin
 d none lib/svc/method 0755 root bin
-f none lib/svc/method/svc-rdc=etc/init.d/rdc 0744 root bin
-f none lib/svc/method/svc-rdcsyncd=etc/init.d/rdcfinish 0744 root bin
+l none lib/svc/method/svc-rdc=../../../etc/init.d/rdc
+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
-f manifest var/svc/manifest/system/nws_rdc.xml=usr/lib/nws_rdc.xml 0444 root sys
-f manifest var/svc/manifest/system/nws_rdcsyncd.xml=usr/lib/nws_rdcsyncd.xml 0444 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
diff --git a/usr/src/pkgdefs/SUNWrdcu/prototype_com b/usr/src/pkgdefs/SUNWrdcu/prototype_com
index d392d3ada8..f735dc2d9e 100644
--- a/usr/src/pkgdefs/SUNWrdcu/prototype_com
+++ b/usr/src/pkgdefs/SUNWrdcu/prototype_com
@@ -17,7 +17,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.
 #
 # This required package information file contains a list of package contents.
@@ -51,12 +51,22 @@ f none usr/lib/librdc.so.1 0755 root bin
 d none usr/lib/mdb 0755 root sys
 d none usr/lib/mdb/kvm 0755 root sys
 
-f none usr/lib/sndrd=usr/bin/sndrd 0555 root bin
-f none usr/lib/sndrsyncd=usr/bin/sndrsyncd 0555 root bin
+d none usr/bin 0755 root bin
+f none usr/bin/sndrd 0555 root bin
+f none usr/bin/sndrsyncd 0555 root bin
+f none usr/bin/sndrboot 0555 root bin
+f none usr/bin/sndradm 0555 root bin
 
 d none usr/sbin 0755 root bin
-f none usr/sbin/sndrboot=usr/bin/sndrboot 0555 root bin
-f none usr/sbin/sndradm=usr/bin/sndradm 0555 root bin
+l none usr/sbin/sndrboot=../bin/sndrboot 0555 root bin
+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
@@ -64,6 +74,6 @@ 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
-f none usr/cluster/sbin/rdc=etc/init.d/rdc.cluster 0744 root bin
+l none usr/cluster/sbin/rdc=../../../etc/init.d/rdc.cluster
 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/SUNWrdcu/prototype_i386 b/usr/src/pkgdefs/SUNWrdcu/prototype_i386
index fd84416405..b597b93b06 100644
--- a/usr/src/pkgdefs/SUNWrdcu/prototype_i386
+++ b/usr/src/pkgdefs/SUNWrdcu/prototype_i386
@@ -17,7 +17,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.
 #
 #
@@ -33,14 +33,18 @@
 !include prototype_com
 
 d none usr/kernel/drv/amd64 0755 root sys
-f none usr/kernel/drv/amd64/rdc 0755 root sys
 f none usr/kernel/drv/rdc 0755 root sys
+f none usr/kernel/drv/rdcstub 0755 root sys
+f none usr/kernel/drv/rdcsrv 0755 root sys
+f none usr/kernel/drv/amd64/rdc 0755 root sys
+f none usr/kernel/drv/amd64/rdcstub 0755 root sys
+f none usr/kernel/drv/amd64/rdcsrv 0755 root sys
 
 d none usr/kernel/misc/amd64 0755 root sys
-f none usr/kernel/misc/rdcstub=usr/kernel/drv/rdcstub 0755 root sys
-f none usr/kernel/misc/amd64/rdcstub=usr/kernel/drv/amd64/rdcstub 0755 root sys
-f none usr/kernel/misc/rdcsrv=usr/kernel/drv/rdcsrv 0755 root sys
-f none usr/kernel/misc/amd64/rdcsrv=usr/kernel/drv/amd64/rdcsrv 0755 root sys
+l none usr/kernel/misc/rdcstub=../drv/rdcstub
+l none usr/kernel/misc/amd64/rdcstub=../../drv/amd64/rdcstub
+l none usr/kernel/misc/rdcsrv=../drv/rdcsrv
+l none usr/kernel/misc/amd64/rdcsrv=../../drv/amd64/rdcsrv
 
 d none usr/lib/mdb/kvm/amd64 0755 root sys
 f none usr/lib/mdb/kvm/rdc.so 0555 root sys
diff --git a/usr/src/pkgdefs/SUNWrdcu/prototype_sparc b/usr/src/pkgdefs/SUNWrdcu/prototype_sparc
index 3adf057ccf..3fce4842c9 100644
--- a/usr/src/pkgdefs/SUNWrdcu/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWrdcu/prototype_sparc
@@ -17,7 +17,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.
 #
 # This required package information file contains a list of package contents.
@@ -33,10 +33,12 @@
 
 d none usr/kernel/drv/sparcv9 0755 root sys
 f none usr/kernel/drv/sparcv9/rdc 0755 root sys
+f none usr/kernel/drv/sparcv9/rdcstub 0755 root sys
+f none usr/kernel/drv/sparcv9/rdcsrv 0755 root sys
 
 d none usr/kernel/misc/sparcv9 0755 root sys
-f none usr/kernel/misc/sparcv9/rdcstub=usr/kernel/drv/sparcv9/rdcstub 0755 root sys
-f none usr/kernel/misc/sparcv9/rdcsrv=usr/kernel/drv/sparcv9/rdcsrv 0755 root sys
+l none usr/kernel/misc/sparcv9/rdcstub=../../drv/sparcv9/rdcstub
+l none usr/kernel/misc/sparcv9/rdcsrv=../../drv/sparcv9/rdcsrv
 
 d none usr/lib/mdb/kvm/sparcv9 0755 root sys
 f none usr/lib/mdb/kvm/sparcv9/rdc.so 0555 root sys
diff --git a/usr/src/pkgdefs/SUNWscmr/prototype_com b/usr/src/pkgdefs/SUNWscmr/prototype_com
index ccdb0a9690..f00a332dab 100644
--- a/usr/src/pkgdefs/SUNWscmr/prototype_com
+++ b/usr/src/pkgdefs/SUNWscmr/prototype_com
@@ -18,7 +18,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.
 #
 # This required package information file contains a list of package contents.
@@ -39,18 +39,25 @@ i i.manifest
 i r.manifest
 
 d none etc 0755 root sys
-f none etc/dscfg_format=etc/dscfg_format 0744 root sys
+f none etc/dscfg_format 0744 root sys
+
+d none etc/init.d 0755 root sys
+f none etc/init.d/scm 0744 root bin
 
 d none lib 0755 root bin
 d none lib/svc 0755 root bin
 d none lib/svc/method 0755 root bin
-f none lib/svc/method/svc-scm=etc/init.d/scm 0744 root bin
+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
-f manifest var/svc/manifest/system/nws_scm.xml=usr/lib/nws_scm.xml 0444 root sys
+l manifest var/svc/manifest/system/nws_scm.xml=../../../../usr/lib/nws_scm.xml
diff --git a/usr/src/pkgdefs/SUNWscmu/prototype_com b/usr/src/pkgdefs/SUNWscmu/prototype_com
index 8fdd218fb5..e02050c9ce 100644
--- a/usr/src/pkgdefs/SUNWscmu/prototype_com
+++ b/usr/src/pkgdefs/SUNWscmu/prototype_com
@@ -17,7 +17,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.
 #
 # This required package information file contains a list of package contents.
@@ -46,28 +46,41 @@ f none usr/kernel/drv/nskern.conf 0644 root sys
 f none usr/kernel/drv/ncall.conf 0644 root sys
 d none usr/kernel/misc 0755 root sys
 
+d none usr/bin 0755 root bin
+f none usr/bin/nskernd 0555 root bin
+f none usr/bin/dscfglockd 0555 root bin
+f none usr/bin/ncalladm 0555 root bin
+f none usr/bin/dscfg 0555 root bin
+f none usr/bin/dsbitmap 0555 root bin
+f none usr/bin/scmadm 0555 root bin
+f none usr/bin/dscfgadm 0555 root bin
+f none usr/bin/nscadm 0555 root bin
+f none usr/bin/dsstat 0555 root bin
+f none usr/bin/dscfg_reconfigure.cluster 0555 root bin
+
 # /usr/lib/mdb directory structure
 d none usr/lib 0755 root bin
 d none usr/lib/mdb 0755 root sys
 d none usr/lib/mdb/kvm 0755 root sys
-f none usr/lib/nskernd=usr/bin/nskernd 0555 root bin
-f none usr/lib/dscfglockd=usr/bin/dscfglockd 0555 root bin
+
+l none usr/lib/nskernd=../bin/nskernd
+l none usr/lib/dscfglockd=../bin/dscfglockd
 f none usr/lib/libdscfg.so.1 0755 root bin
 f none usr/lib/libunistat.so.1 0755 root bin
 f none usr/lib/libnsctl.so.1 0755 root bin
-f none usr/lib/ncalladm=usr/bin/ncalladm 0555 root bin
+l none usr/lib/ncalladm=../bin/ncalladm
 
 d none usr/sbin 0755 root bin
-f none usr/sbin/dscfg=usr/bin/dscfg 0555 root bin
-f none usr/sbin/dsbitmap=usr/bin/dsbitmap 0555 root bin
-f none usr/sbin/scmadm=usr/bin/scmadm 0555 root bin
-f none usr/sbin/dscfgadm=usr/bin/dscfgadm 0555 root bin
-f none usr/sbin/nscadm=usr/bin/nscadm 0555 root bin
-f none usr/sbin/dsstat=usr/bin/dsstat 0555 root bin
+l none usr/sbin/dscfg=../bin/dscfg
+l none usr/sbin/dsbitmap=../bin/dsbitmap
+l none usr/sbin/scmadm=../bin/scmadm
+l none usr/sbin/dscfgadm=../bin/dscfgadm
+l none usr/sbin/nscadm=../bin/nscadm
+l none usr/sbin/dsstat=../bin/dsstat
 
 d none usr/cluster 0755 root sys
 d none usr/cluster/lib 0755 root bin
 d none usr/cluster/lib/start 0755 root bin
 d none usr/cluster/lib/stop 0755 root bin
 d none usr/cluster/sbin 0755 root other
-f none usr/cluster/sbin/dscfg_reconfigure=usr/bin/dscfg_reconfigure.cluster 0555 root bin
+l none usr/cluster/sbin/dscfg_reconfigure=../../bin/dscfg_reconfigure.cluster
diff --git a/usr/src/pkgdefs/SUNWscmu/prototype_i386 b/usr/src/pkgdefs/SUNWscmu/prototype_i386
index 3a80d15ea7..062299634c 100644
--- a/usr/src/pkgdefs/SUNWscmu/prototype_i386
+++ b/usr/src/pkgdefs/SUNWscmu/prototype_i386
@@ -17,7 +17,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.
 #
 #
@@ -50,4 +50,4 @@ d none usr/lib/mdb/kvm/amd64 0755 root sys
 f none usr/lib/mdb/kvm/nsctl.so 0555 root sys
 f none usr/lib/mdb/kvm/amd64/nsctl.so 0555 root sys
 f none usr/lib/mdb/kvm/sdbc.so 0555 root sys
-f none usr/lib/mdb/kvm/amd64/sdbc.so=usr/lib/mdb/kvm/amd64/sdbc.so 0555 root sys
+f none usr/lib/mdb/kvm/amd64/sdbc.so 0555 root sys
diff --git a/usr/src/pkgdefs/SUNWscmu/prototype_sparc b/usr/src/pkgdefs/SUNWscmu/prototype_sparc
index 9bab76a322..47019f5f20 100644
--- a/usr/src/pkgdefs/SUNWscmu/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWscmu/prototype_sparc
@@ -17,7 +17,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.
 #
 #
@@ -43,4 +43,4 @@ f none usr/kernel/misc/sparcv9/spuni 0755 root sys
 # /usr/lib/mdb directory structure
 d none usr/lib/mdb/kvm/sparcv9 0755 root sys
 f none usr/lib/mdb/kvm/sparcv9/nsctl.so 0555 root sys
-f none usr/lib/mdb/kvm/sparcv9/sdbc.so=usr/lib/mdb/kvm/sparcv9/sdbc.so 0555 root sys
+f none usr/lib/mdb/kvm/sparcv9/sdbc.so 0555 root sys
diff --git a/usr/src/pkgdefs/SUNWspsvr/prototype_com b/usr/src/pkgdefs/SUNWspsvr/prototype_com
index 5e627d266b..fa608466d4 100644
--- a/usr/src/pkgdefs/SUNWspsvr/prototype_com
+++ b/usr/src/pkgdefs/SUNWspsvr/prototype_com
@@ -18,7 +18,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.
 #
 # This required package information file contains a list of package contents.
@@ -39,17 +39,25 @@ i depend
 i i.manifest
 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
+
 d none lib 0755 root bin
 d none lib/svc 0755 root bin
 d none lib/svc/method 0755 root bin
-f none lib/svc/method/svc-sv=etc/init.d/sv 0744 root bin
+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
-f manifest var/svc/manifest/system/nws_sv.xml=usr/lib/nws_sv.xml 0444 root sys
+l manifest var/svc/manifest/system/nws_sv.xml=../../../../usr/lib/nws_sv.xml
diff --git a/usr/src/pkgdefs/SUNWspsvu/prototype_com b/usr/src/pkgdefs/SUNWspsvu/prototype_com
index 8f5ce847fe..b8c6095ba4 100644
--- a/usr/src/pkgdefs/SUNWspsvu/prototype_com
+++ b/usr/src/pkgdefs/SUNWspsvu/prototype_com
@@ -17,7 +17,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.
 #
 # This required package information file contains a list of package contents.
@@ -46,9 +46,17 @@ d none usr/lib 0755 root bin
 d none usr/lib/mdb 0755 root sys
 d none usr/lib/mdb/kvm 0755 root sys
 
+d none usr/bin 0755 root bin
+f none usr/bin/svadm 0555 root bin
+f none usr/bin/svboot 0555 root bin
+
 d none usr/sbin 0755 root bin
-f none usr/sbin/svadm=usr/bin/svadm 0555 root bin
-f none usr/sbin/svboot=usr/bin/svboot 0555 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
@@ -56,6 +64,6 @@ 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
-f none usr/cluster/sbin/sv=etc/init.d/sv.cluster 0744 root bin
+l none usr/cluster/sbin/sv=../../../etc/init.d/sv.cluster
 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/intel/rdcsrv/Makefile b/usr/src/uts/intel/rdcsrv/Makefile
index 817f252120..c9571b27b5 100644
--- a/usr/src/uts/intel/rdcsrv/Makefile
+++ b/usr/src/uts/intel/rdcsrv/Makefile
@@ -18,7 +18,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.
 #
 # uts/intel/rdcsrv/Makefile
@@ -44,6 +44,7 @@ OBJECTS		= $(RDCSRV_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(RDCSRV_OBJS:%.o=$(LINTS_DIR)/%.ln)
 INC_PATH	+= -I$(ROOT)/usr/include
 ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+ROOTLINK        = $(USR_MISC_DIR)/$(MODULE)
 
 #
 #       Include common rules.
@@ -56,7 +57,7 @@ include $(UTSBASE)/common/avs/Makefile.com
 #
 ALL_TARGET	= $(BINARY)
 LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK)
 
 #
 # lint pass one enforcement
@@ -83,6 +84,9 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 
 install:	$(INSTALL_DEPS)
 
+$(ROOTLINK):	$(USR_MISC_DIR) $(ROOTMODULE)
+		-$(RM) $@; $(LN) $(ROOTMODULE) $@
+
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/intel/rdcstub/Makefile b/usr/src/uts/intel/rdcstub/Makefile
index 9265f5f99e..2a91cc1d7e 100644
--- a/usr/src/uts/intel/rdcstub/Makefile
+++ b/usr/src/uts/intel/rdcstub/Makefile
@@ -18,7 +18,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.
 #
 # uts/intel/rdcstub/Makefile
@@ -44,6 +44,7 @@ OBJECTS		= $(RDCSTUB_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(RDCSTUB_OBJS:%.o=$(LINTS_DIR)/%.ln)
 INC_PATH	+= -I$(ROOT)/usr/include
 ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+ROOTLINK        = $(USR_MISC_DIR)/$(MODULE)
 
 #
 #       Include common rules.
@@ -56,7 +57,7 @@ include $(UTSBASE)/common/avs/Makefile.com
 #
 ALL_TARGET	= $(BINARY)
 LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK)
 
 #
 # lint pass one enforcement
@@ -83,6 +84,9 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 
 install:	$(INSTALL_DEPS)
 
+$(ROOTLINK):	$(USR_MISC_DIR) $(ROOTMODULE)
+		-$(RM) $@; $(LN) $(ROOTMODULE) $@
+
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/sparc/rdcsrv/Makefile b/usr/src/uts/sparc/rdcsrv/Makefile
index a1e7a619a4..9d479e9ff5 100644
--- a/usr/src/uts/sparc/rdcsrv/Makefile
+++ b/usr/src/uts/sparc/rdcsrv/Makefile
@@ -18,7 +18,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.
 #
 # uts/sparc/rdcsrv/Makefile
@@ -44,6 +44,7 @@ OBJECTS		= $(RDCSRV_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(RDCSRV_OBJS:%.o=$(LINTS_DIR)/%.ln)
 INC_PATH	+= -I$(ROOT)/usr/include
 ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+ROOTLINK        = $(USR_MISC_DIR)/$(MODULE)
 
 #
 #       Include common rules.
@@ -56,7 +57,7 @@ include $(UTSBASE)/common/avs/Makefile.com
 #
 ALL_TARGET	= $(BINARY)
 LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK)
 
 #
 # lint pass one enforcement
@@ -83,6 +84,9 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 
 install:	$(INSTALL_DEPS)
 
+$(ROOTLINK):	$(USR_MISC_DIR) $(ROOTMODULE)
+		-$(RM) $@; $(LN) $(ROOTMODULE) $@
+
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/sparc/rdcstub/Makefile b/usr/src/uts/sparc/rdcstub/Makefile
index d26dfeffdc..b8b441e24c 100644
--- a/usr/src/uts/sparc/rdcstub/Makefile
+++ b/usr/src/uts/sparc/rdcstub/Makefile
@@ -18,7 +18,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.
 #
 # uts/sparc/rdcstub/Makefile
@@ -44,6 +44,7 @@ OBJECTS		= $(RDCSTUB_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(RDCSTUB_OBJS:%.o=$(LINTS_DIR)/%.ln)
 INC_PATH	+= -I$(ROOT)/usr/include
 ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+ROOTLINK        = $(USR_MISC_DIR)/$(MODULE)
 
 #
 #       Include common rules.
@@ -56,7 +57,7 @@ include $(UTSBASE)/common/avs/Makefile.com
 #
 ALL_TARGET	= $(BINARY)
 LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK)
 
 #
 # lint pass one enforcement
@@ -83,6 +84,9 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 
 install:	$(INSTALL_DEPS)
 
+$(ROOTLINK):	$(USR_MISC_DIR) $(ROOTMODULE)
+		-$(RM) $@; $(LN) $(ROOTMODULE) $@
+
 #
 #	Include common targets.
 #