PSARC 2008/587 iSCSI Port Provider for COMSTAR

6702584 Need iSCSI port provider for COMSTAR

usr/src/Makefile.lint

@@ -166,7 +166,9 @@ COMMON_SUBDIRS = \
 	cmd/iscsi \
 	cmd/iscsiadm \
 	cmd/iscsid \
+	cmd/iscsitsvc \
 	cmd/isns \
+	cmd/itadm \
 	cmd/join \
 	cmd/kbd \
 	cmd/killall \
@@ -364,6 +366,7 @@ COMMON_SUBDIRS = \
 	lib/libipmp \
 	lib/libipp \
 	lib/libipsecutil \
+	lib/libiscsit \
 	lib/libiscsitgt \
 	lib/libkmf \
 	lib/libkstat \

usr/src/cmd/Makefile

@@ -213,7 +213,9 @@ COMMON_SUBDIRS=		\
 	itutools	\
 	iscsiadm	\
 	iscsid		\
+	iscsitsvc	\
 	isns		\
+	itadm		\
 	java		\
 	join		\
 	kbd		\
@@ -604,6 +606,7 @@ MSGSUBDIRS=		\
 	iscsiadm	\
 	iscsid		\
 	isns		\
+	itadm		\
 	join		\
 	kbd		\
 	krb5		\

usr/src/cmd/Makefile.cmd

@@ -235,6 +235,7 @@ ROOTSVCSYSTEMFILESYSTEM=	$(ROOTSVCSYSTEM)/filesystem
 ROOTSVCSYSTEMSECURITY=		$(ROOTSVCSYSTEM)/security
 ROOTSVCNETWORK=			$(ROOTVARSVCMANIFEST)/network
 ROOTSVCNETWORKDNS=		$(ROOTSVCNETWORK)/dns
+ROOTSVCNETWORKISCSI=		$(ROOTSVCNETWORK)/iscsi
 ROOTSVCNETWORKLDAP=		$(ROOTSVCNETWORK)/ldap
 ROOTSVCNETWORKNFS=		$(ROOTSVCNETWORK)/nfs
 ROOTSVCNETWORKNIS=		$(ROOTSVCNETWORK)/nis

usr/src/cmd/iscsitsvc/Makefile

@@ -0,0 +1,72 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+PROG =	iscsi-target
+
+include ../Makefile.cmd
+
+COMMONBASE = ../../common
+
+LOCAL_OBJS = iscsitsvc.o
+COMMON_OBJS = cmdparse.o
+LOCAL_SRCS =	$(LOCAL_OBJS:%.o=%.c)
+COMMON_SRCS =	$(COMMON_OBJS:%.o=$(COMMONBASE)/cmdparse/%.c)
+OBJS =	$(LOCAL_OBJS) $(COMMON_OBJS)
+SRCS = $(LOCAL_SRCS) $(COMMON_SRCS)
+
+CPPFLAGS += -I$(COMMONBASE)/cmdparse
+
+MANIFEST    = iscsi-target.xml
+SVCMETHOD   = iscsi-target
+
+ROOTMANIFESTDIR	= $(ROOTSVCNETWORKISCSI)
+$(ROOTSVCNETWORKISCSI)/iscsi-target.xml	:= OWNER = root
+$(ROOTSVCNETWORKISCSI)/iscsi-target.xml	:= GROUP = bin
+$(ROOTSVCNETWORKISCSI)/iscsi-target.xml	:= FILEMODE = 0444
+
+.KEEP_STATE:
+
+all: $(PROG)
+
+$(PROG): $(OBJS)
+	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
+	$(POST_PROCESS)
+
+install: all $(ROOTMANIFEST) $(ROOTSVCMETHOD)
+
+check:	$(CHKMANIFEST)
+	$(CSTYLE) -pPc $(SRCS:%=%)
+
+cmdparse.o: $(COMMONBASE)/cmdparse/cmdparse.c
+	    $(COMPILE.c) -o $@ $(COMMONBASE)/cmdparse/cmdparse.c
+	    $(POST_PROCESS_O)
+
+clean:
+	$(RM) $(OBJS)
+
+lint:	lint_SRCS
+
+include ../Makefile.targ

usr/src/cmd/iscsitsvc/iscsi-target.xml

@@ -0,0 +1,110 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+
+<!--
+
+CDDL HEADER START
+
+The contents of this file are subject to the terms of the
+Common Development and Distribution License (the "License").
+You may not use this file except in compliance with the License.
+
+You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+or http://www.opensolaris.org/os/licensing.
+See the License for the specific language governing permissions
+and limitations under the License.
+
+When distributing Covered Code, include this CDDL HEADER in each
+file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+If applicable, add the following below this CDDL HEADER, with the
+fields enclosed by brackets "[]" replaced with your own identifying
+information: Portions Copyright [yyyy] [name of copyright owner]
+
+CDDL HEADER END
+
+Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+Use is subject to license terms.
+
+Service manifests for iSCSI Target 
+-->
+
+<!--
+	network/iscsi/target - Export iSCSI target services
+
+-->
+
+<service_bundle type='manifest' name='SUNWiscsitr:iscsi-target'>
+
+<service
+	name='network/iscsi/target'
+	type='service'
+	version='1'>
+
+	<create_default_instance enabled='false' />
+
+	<single_instance/>
+
+	<dependency name = 'network'
+		grouping='require_any'
+		restart_on='error'
+		type='service'>
+		<service_fmri value='svc:/milestone/network'/>
+	</dependency>
+
+	<dependency name = 'stmf'
+		grouping='require_all'
+		restart_on='none'
+		type='service'>
+		<service_fmri value='svc:/system/stmf:default'/>
+	</dependency>
+
+	<exec_method
+		type='method'
+		name='start'
+		exec='/lib/svc/method/iscsi-target start'
+		timeout_seconds='600'>
+		<method_context>
+			<method_credential
+			user='root'
+			group='root'
+			privileges='basic,sys_devices'
+			/>
+		</method_context>
+	</exec_method>
+
+	<exec_method
+		type='method'
+		name='stop'
+		exec='/lib/svc/method/iscsi-target stop'
+		timeout_seconds='600'>
+		<method_context>
+			<method_credential
+			user='root'
+			group='root'
+			privileges='basic,sys_devices'
+			/>
+		</method_context>
+	</exec_method>
+
+	<property_group name='startd' type='framework'>
+		<propval name='duration' type='astring'
+			value='transient' />
+	</property_group>
+
+	<stability value='Evolving' />
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>
+				iscsi target
+			</loctext>
+		</common_name>
+		<documentation>
+			<manpage title='itadm' section='1M'
+				manpath='/usr/share/man' />
+		</documentation>
+	</template>
+
+</service>
+
+</service_bundle>