[csw-devel] SF.net SVN: gar:[2997] csw/mgar/pkg/dbus/trunk

[wbonnet at users.sourceforge.net]

Revision: 2997
          http://gar.svn.sourceforge.net/gar/?rev=2997&view=rev
Author:   wbonnet
Date:     2009-02-05 19:44:31 +0000 (Thu, 05 Feb 2009)

Log Message:
-----------
Change clases order

Modified Paths:
--------------
    csw/mgar/pkg/dbus/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/dbus/trunk/files/svc-dbus

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2009-02-05 10:33:17 UTC (rev 2996)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2009-02-05 19:44:31 UTC (rev 2997)
@@ -41,7 +41,7 @@
 REQUIRED_PKGS_CSWlibdbusdev  = CSWlibdbus
 
 # SMF support
-SPKG_CLASSES_CSWdbus = none cswinitsmf cswcpsampleconf
+SPKG_CLASSES_CSWdbus = none cswcpsampleconf cswinitsmf 
 PROTOTYPE_FILTER  = awk '$$$$3 ~ /\/init.d\/cswdbus$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/system.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/session.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }'
 	
 CONFIGURE_ARGS = $(DIRPATHS)

Deleted: csw/mgar/pkg/dbus/trunk/files/svc-dbus
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/svc-dbus	2009-02-05 10:33:17 UTC (rev 2996)
+++ csw/mgar/pkg/dbus/trunk/files/svc-dbus	2009-02-05 19:44:31 UTC (rev 2997)
@@ -1,72 +0,0 @@
-#!/sbin/sh
-#
-# 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 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"@(#)svc-dbus	1.1	06/04/24 SMI"
-
-FMRI=svc:/system/dbus:default
-
-. /lib/svc/share/smf_include.sh
-
-if [ ! -x /usr/lib/dbus-daemon ]; then
-	echo "/usr/lib/dbus-daemon not found or not executable"
-	exit $SMF_EXIT_ERR_FATAL
-fi
-
-# Generate machine-id regardless of zones
-if [ ! -f /var/lib/dbus/machine-id ]; then
-	/usr/bin/dbus-uuidgen --ensure
-fi
-
-if smf_is_nonglobalzone; then
-	   /usr/sbin/svcadm disable -t svc:/system/dbus
-        echo "dbus-daemon cannot be run in non-global zones"
-	   sleep 5 &
-	   exit $SMF_EXIT_OK
-fi
-
-case "$1" in
-'start')
-	# temporary hacks
-	if [ ! -d /var/run/dbus ]; then
-		mkdir /var/run/dbus
-	fi
-	if [ -f /var/run/dbus/pid ]; then
-		rm -f /var/run/dbus/pid
-	fi
-
-	/usr/lib/dbus-daemon --system
-	err=$?
-	if [ $err -ne 0 ]; then
-		echo "dbus failed to start: error $err"
-		exit $SMF_EXIT_ERR_FATAL
-	fi
-
-	;;
-*)
-        echo "Usage: $0 { start }"
-	exit $SMF_EXIT_ERR_FATAL 
-        ;;
-esac
-
-exit $SMF_EXIT_OK


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.