Mercurial > illumos > illumos-gate
changeset 10677:87ba5ba8d680
6882670 SMD should not delete custom manifests on upgrade path
| author | Sean Wilcox <Sean.Wilcox@Sun.COM> |
|---|---|
| date | Mon, 28 Sep 2009 18:11:46 -0700 |
| parents | 7a362d5571c5 |
| children | 342b952ac38d |
| files | usr/src/cmd/svc/shell/Makefile usr/src/cmd/svc/shell/manifest_cleanup.ksh usr/src/cmd/svc/shell/mfsthistory usr/src/cmd/svc/svccfg/svccfg_libscf.c usr/src/pkgdefs/SUNWcsr/prototype_com |
| diffstat | 5 files changed, 773 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/svc/shell/Makefile Mon Sep 28 17:05:18 2009 -0700 +++ b/usr/src/cmd/svc/shell/Makefile Mon Sep 28 18:11:46 2009 -0700 @@ -32,6 +32,7 @@ routing_include.sh \ sendmail_include.sh \ smf_include.sh \ + mfsthistory \ manifest_cleanup.ksh SCRIPTS = $(SRCS:%=$(ROOT)/lib/svc/share/%)
--- a/usr/src/cmd/svc/shell/manifest_cleanup.ksh Mon Sep 28 17:05:18 2009 -0700 +++ b/usr/src/cmd/svc/shell/manifest_cleanup.ksh Mon Sep 28 18:11:46 2009 -0700 @@ -36,6 +36,7 @@ MFSTSCAN=/lib/svc/bin/mfstscan MCLEANUPFILE=/etc/svc/volatile/mcleanup.$$ IGNORELIST="system/install-discovery smf/manifest" +MFSTHISTORY=/lib/svc/share/mfsthistory UPLIST=0 # @@ -58,9 +59,6 @@ eval $cl_invent=\"\$$cl_invent $cl_mfile\" - # XXX - remove this line at some point " - # I clears up the above escaped quote throwing - # off my color scheme in vim. done done UPLIST=1 @@ -152,13 +150,17 @@ # for mf in ${ps_mfiles[@]} do + # + # This is an unsupported service just return + # skipping the service. + # + [ ${mf%/var/svc/manifest*} ] && return + if [ ! -f $mf ]; then ps_mfiles_tmp="$ps_mfiles_tmp $mf" continue fi - [ ${mf%/var/svc/manifest*} ] && continue - inst=`get_instances $mf` set -A ps_inst_list @@ -328,6 +330,12 @@ if [ "$1" == "FALSE" ]; then am_lisnap=1 am_inst=`svcs -H -oFMRI $am_service 2>/dev/null` + + # + # Check for a last-import snapshot, if there is not + # one then the service was hand crafted and the support + # should be set to false. + # if [ $? -eq 0 ]; then for i in $am_inst do @@ -336,16 +344,33 @@ done fi - if [ $am_lisnap -eq 0 ]; then + if [ $am_lisnap -ne 0 ]; then + $SVCCFG -s $am_service setprop $MFSTPG/support = boolean: 0 + + return + fi + + # + # If the service was not hand crafted then check to see if + # the service has ever been installed in the /var/svc/manifest + # directory and therefore a known removed service. + # + grep "$am_service " $MFSTHISTORY | grep -v "^#" > /dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "$SVCCFG delete $am_service" $SVCCFG delete -f $am_service else + # + # Do not know where the service came from so set + # it to false. + # $SVCCFG -s $am_service setprop $MFSTPG/support = boolean: 0 fi else for am_mfile in $@ do CF=${am_mfile#/*} - CF=`echo $CF | sed -e 's/[-\/\,\.]/_/g'` + CF=`echo $CF | sed -e 's/[\/\,\.]/_/g'` $SVCCFG -s $am_service setprop $MFSTPG/$CF = astring: $am_mfile done fi @@ -434,9 +459,11 @@ do svcprop -q -p $MFSTPG $service if [ $? -ne 0 ]; then - if [[ $IGNORELIST == $ps_service ]]; then + mc_igchk=`eval expr \"$IGNORELIST \" : "'.*\($service \)'"` + if [[ -n $mc_igchk ]]; then echo "add_manifest $service FALSE" add_manifest $service FALSE + continue fi [ $UPLIST -eq 0 ] && create_list
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/cmd/svc/shell/mfsthistory Mon Sep 28 18:11:46 2009 -0700 @@ -0,0 +1,662 @@ +# +# 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 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# This file is for historical purposes only, and should not be modified. +# +svc:/platform/sun4us/fjsvdrd:default var/svc/manifest/platform/sun4us/fjsvdrd.xml +svc:/platform/sun4us/fjsvdrd var/svc/manifest/platform/sun4us/fjsvdrd.xml +svc:/system/sar:default var/svc/manifest/system/sar.xml +svc:/system/sar var/svc/manifest/system/sar.xml +svc:/system/sysidtool:system var/svc/manifest/system/sysidtool.xml +svc:/system/sysidtool:net var/svc/manifest/system/sysidtool.xml +svc:/system/sysidtool var/svc/manifest/system/sysidtool.xml +svc:/network/http:apache2 var/svc/manifest/network/http-apache2.xml +svc:/network/http var/svc/manifest/network/http-apache2.xml +svc:/network/apocd/udp:default var/svc/manifest/network/apocd.xml +svc:/network/apocd/udp var/svc/manifest/network/apocd.xml +svc:/system/filesystem/autofs:default var/svc/manifest/system/filesystem/autofs.xml +svc:/system/filesystem/autofs var/svc/manifest/system/filesystem/autofs.xml +svc:/network/dns/server:bind9 var/svc/manifest/network/dns/bind9-server.xml +svc:/network/dns/server var/svc/manifest/network/dns/bind9-server.xml +svc:/network/uucp:default var/svc/manifest/network/uucp.xml +svc:/network/uucp var/svc/manifest/network/uucp.xml +svc:/network/rarp:default var/svc/manifest/network/rarp.xml +svc:/network/rarp var/svc/manifest/network/rarp.xml +svc:/network/rpc/bootparams:default var/svc/manifest/network/rpc/bootparams.xml +svc:/network/rpc/bootparams var/svc/manifest/network/rpc/bootparams.xml +svc:/system/device/fc-fabric:default var/svc/manifest/system/device/devices-fc-fabric.xml +svc:/system/device/fc-fabric var/svc/manifest/system/device/devices-fc-fabric.xml +svc:/system/dumpadm:default var/svc/manifest/system/dumpadm.xml +svc:/system/dumpadm var/svc/manifest/system/dumpadm.xml +svc:/system/fmd:default var/svc/manifest/system/fmd.xml +svc:/system/fmd var/svc/manifest/system/fmd.xml +svc:/network/chargen:stream var/svc/manifest/network/chargen.xml +svc:/network/chargen:dgram var/svc/manifest/network/chargen.xml +svc:/network/chargen var/svc/manifest/network/chargen.xml +svc:/network/daytime:stream var/svc/manifest/network/daytime.xml +svc:/network/daytime:dgram var/svc/manifest/network/daytime.xml +svc:/network/daytime var/svc/manifest/network/daytime.xml +svc:/network/discard:stream var/svc/manifest/network/discard.xml +svc:/network/discard:dgram var/svc/manifest/network/discard.xml +svc:/network/discard var/svc/manifest/network/discard.xml +svc:/network/echo:stream var/svc/manifest/network/echo.xml +svc:/network/echo:dgram var/svc/manifest/network/echo.xml +svc:/network/echo var/svc/manifest/network/echo.xml +svc:/network/time:stream var/svc/manifest/network/time.xml +svc:/network/time:dgram var/svc/manifest/network/time.xml +svc:/network/time var/svc/manifest/network/time.xml +svc:/system/sysevent:default var/svc/manifest/system/sysevent.xml +svc:/system/sysevent var/svc/manifest/system/sysevent.xml +svc:/milestone/multi-user-server:default var/svc/manifest/milestone/multi-user-server.xml +svc:/milestone/multi-user-server var/svc/manifest/milestone/multi-user-server.xml +svc:/milestone/multi-user:default var/svc/manifest/milestone/multi-user.xml +svc:/milestone/multi-user var/svc/manifest/milestone/multi-user.xml +svc:/milestone/name-services:default var/svc/manifest/milestone/name-services.xml +svc:/milestone/name-services var/svc/manifest/milestone/name-services.xml +svc:/milestone/network:default var/svc/manifest/milestone/network.xml +svc:/milestone/network var/svc/manifest/milestone/network.xml +svc:/milestone/single-user:default var/svc/manifest/milestone/single-user.xml +svc:/milestone/single-user var/svc/manifest/milestone/single-user.xml +svc:/network/dns/client:default var/svc/manifest/network/dns/client.xml +svc:/network/dns/client var/svc/manifest/network/dns/client.xml +svc:/network/dns/server:default var/svc/manifest/network/dns/server.xml +svc:/network/dns/server var/svc/manifest/network/dns/server.xml +svc:/network/inetd-upgrade:default var/svc/manifest/network/inetd-upgrade.xml +svc:/network/inetd-upgrade var/svc/manifest/network/inetd-upgrade.xml +svc:/network/inetd:default var/svc/manifest/network/inetd.xml +svc:/network/inetd var/svc/manifest/network/inetd.xml +svc:/network/ldap/client:default var/svc/manifest/network/ldap/client.xml +svc:/network/ldap/client var/svc/manifest/network/ldap/client.xml +svc:/network/initial:default var/svc/manifest/network/network-initial.xml +svc:/network/initial var/svc/manifest/network/network-initial.xml +svc:/network/loopback:default var/svc/manifest/network/network-loopback.xml +svc:/network/loopback var/svc/manifest/network/network-loopback.xml +svc:/network/physical:default var/svc/manifest/network/network-physical.xml +svc:/network/physical var/svc/manifest/network/network-physical.xml +svc:/network/service:default var/svc/manifest/network/network-service.xml +svc:/network/service var/svc/manifest/network/network-service.xml +svc:/network/rpc/bind:default var/svc/manifest/network/rpc/bind.xml +svc:/network/rpc/bind var/svc/manifest/network/rpc/bind.xml +svc:/network/rpc/keyserv:default var/svc/manifest/network/rpc/keyserv.xml +svc:/network/rpc/keyserv var/svc/manifest/network/rpc/keyserv.xml +svc:/platform/sun4u/mpxio-upgrade:default var/svc/manifest/platform/sun4u/mpxio-upgrade.xml +svc:/platform/sun4u/mpxio-upgrade var/svc/manifest/platform/sun4u/mpxio-upgrade.xml +svc:/system/consadm:default var/svc/manifest/system/consadm.xml +svc:/system/consadm var/svc/manifest/system/consadm.xml +svc:/system/console-login:default var/svc/manifest/system/console-login.xml +svc:/system/console-login var/svc/manifest/system/console-login.xml +svc:/system/coreadm:default var/svc/manifest/system/coreadm.xml +svc:/system/coreadm var/svc/manifest/system/coreadm.xml +svc:/system/cron:default var/svc/manifest/system/cron.xml +svc:/system/cron var/svc/manifest/system/cron.xml +svc:/system/cryptosvc:default var/svc/manifest/system/cryptosvc.xml +svc:/system/cryptosvc var/svc/manifest/system/cryptosvc.xml +svc:/system/device/local:default var/svc/manifest/system/device/devices-local.xml +svc:/milestone/devices:default var/svc/manifest/system/device/devices-local.xml +svc:/system/device/local var/svc/manifest/system/device/devices-local.xml +svc:/milestone/devices var/svc/manifest/system/device/devices-local.xml +svc:/system/filesystem/local:default var/svc/manifest/system/filesystem/local-fs.xml +svc:/system/filesystem/local var/svc/manifest/system/filesystem/local-fs.xml +svc:/system/filesystem/minimal:default var/svc/manifest/system/filesystem/minimal-fs.xml +svc:/system/filesystem/minimal var/svc/manifest/system/filesystem/minimal-fs.xml +svc:/system/filesystem/root:default var/svc/manifest/system/filesystem/root-fs.xml +svc:/system/filesystem/root var/svc/manifest/system/filesystem/root-fs.xml +svc:/system/filesystem/usr:default var/svc/manifest/system/filesystem/usr-fs.xml +svc:/system/filesystem/usr var/svc/manifest/system/filesystem/usr-fs.xml +svc:/system/identity:domain var/svc/manifest/system/identity.xml +svc:/system/identity:node var/svc/manifest/system/identity.xml +svc:/system/identity var/svc/manifest/system/identity.xml +svc:/system/keymap:default var/svc/manifest/system/keymap.xml +svc:/system/keymap var/svc/manifest/system/keymap.xml +svc:/system/manifest-import:default var/svc/manifest/system/manifest-import.xml +svc:/system/manifest-import var/svc/manifest/system/manifest-import.xml +svc:/system/name-service-cache:default var/svc/manifest/system/name-service-cache.xml +svc:/system/name-service-cache var/svc/manifest/system/name-service-cache.xml +svc:/system/rmtmpfiles:default var/svc/manifest/system/rmtmpfiles.xml +svc:/system/rmtmpfiles var/svc/manifest/system/rmtmpfiles.xml +svc:/system/sac:default var/svc/manifest/system/sac.xml +svc:/system/sac var/svc/manifest/system/sac.xml +svc:/system/svc/restarter:default var/svc/manifest/system/svc/restarter.xml +svc:/system/svc/restarter var/svc/manifest/system/svc/restarter.xml +svc:/system/system-log:default var/svc/manifest/system/system-log.xml +svc:/system/system-log var/svc/manifest/system/system-log.xml +svc:/system/utmp:default var/svc/manifest/system/utmp.xml +svc:/system/utmp var/svc/manifest/system/utmp.xml +svc:/system/cvc:default var/svc/manifest/system/cvc.xml +svc:/system/cvc var/svc/manifest/system/cvc.xml +svc:/platform/sun4u/dcs:default var/svc/manifest/platform/sun4u/dcs.xml +svc:/platform/sun4u/dcs var/svc/manifest/platform/sun4u/dcs.xml +svc:/network/dhcp-server:default var/svc/manifest/network/dhcp-server.xml +svc:/network/dhcp-server var/svc/manifest/network/dhcp-server.xml +svc:/platform/sun4u/efdaemon:default var/svc/manifest/platform/sun4u/efdaemon.xml +svc:/platform/sun4u/efdaemon var/svc/manifest/platform/sun4u/efdaemon.xml +svc:/application/font/fc-cache:default var/svc/manifest/application/font/fc-cache.xml +svc:/application/font/fc-cache var/svc/manifest/application/font/fc-cache.xml +svc:/network/ftp:default var/svc/manifest/network/ftp.xml +svc:/network/ftp var/svc/manifest/network/ftp.xml +svc:/application/gdm2-login:default var/svc/manifest/application/gdm2-login.xml +svc:/application/gdm2-login var/svc/manifest/application/gdm2-login.xml +svc:/network/rpc/gss:default var/svc/manifest/network/rpc/gss.xml +svc:/network/rpc/gss var/svc/manifest/network/rpc/gss.xml +svc:/network/ipfilter:default var/svc/manifest/network/ipfilter.xml +svc:/network/ipfilter var/svc/manifest/network/ipfilter.xml +svc:/network/pfil:default var/svc/manifest/network/pfil.xml +svc:/network/pfil var/svc/manifest/network/pfil.xml +svc:/application/print/ipp-listener:default var/svc/manifest/application/print/ipp-listener.xml +svc:/application/print/ipp-listener var/svc/manifest/application/print/ipp-listener.xml +svc:/network/security/krb5_prop:default var/svc/manifest/network/security/krb5_prop.xml +svc:/network/security/krb5_prop var/svc/manifest/network/security/krb5_prop.xml +svc:/network/security/kadmin:default var/svc/manifest/network/security/kadmin.xml +svc:/network/security/kadmin var/svc/manifest/network/security/kadmin.xml +svc:/network/security/krb5kdc:default var/svc/manifest/network/security/krb5kdc.xml +svc:/network/security/krb5kdc var/svc/manifest/network/security/krb5kdc.xml +svc:/network/security/ktkt_warn:default var/svc/manifest/network/security/ktkt_warn.xml +svc:/network/security/ktkt_warn var/svc/manifest/network/security/ktkt_warn.xml +svc:/network/rpc/mdcomm:default var/svc/manifest/network/rpc/mdcomm.xml +svc:/network/rpc/mdcomm var/svc/manifest/network/rpc/mdcomm.xml +svc:/network/rpc/meta:default var/svc/manifest/network/rpc/meta.xml +svc:/network/rpc/meta var/svc/manifest/network/rpc/meta.xml +svc:/network/rpc/metamed:default var/svc/manifest/network/rpc/metamed.xml +svc:/network/rpc/metamed var/svc/manifest/network/rpc/metamed.xml +svc:/network/rpc/metamh:default var/svc/manifest/network/rpc/metamh.xml +svc:/network/rpc/metamh var/svc/manifest/network/rpc/metamh.xml +svc:/system/mdmonitor:default var/svc/manifest/system/mdmonitor.xml +svc:/system/mdmonitor var/svc/manifest/system/mdmonitor.xml +svc:/system/metainit:default var/svc/manifest/system/metainit.xml +svc:/system/metainit var/svc/manifest/system/metainit.xml +svc:/network/nfs/cbd:default var/svc/manifest/network/nfs/cbd.xml +svc:/network/nfs/cbd var/svc/manifest/network/nfs/cbd.xml +svc:/network/nfs/client:default var/svc/manifest/network/nfs/client.xml +svc:/network/nfs/client var/svc/manifest/network/nfs/client.xml +svc:/network/nfs/mapid:default var/svc/manifest/network/nfs/mapid.xml +svc:/network/nfs/mapid var/svc/manifest/network/nfs/mapid.xml +svc:/network/nfs/nlockmgr:default var/svc/manifest/network/nfs/nlockmgr.xml +svc:/network/nfs/nlockmgr var/svc/manifest/network/nfs/nlockmgr.xml +svc:/network/nfs/status:default var/svc/manifest/network/nfs/status.xml +svc:/network/nfs/status var/svc/manifest/network/nfs/status.xml +svc:/network/nfs/rquota:default var/svc/manifest/network/nfs/rquota.xml +svc:/network/nfs/rquota var/svc/manifest/network/nfs/rquota.xml +svc:/network/nfs/server:default var/svc/manifest/network/nfs/server.xml +svc:/network/nfs/server var/svc/manifest/network/nfs/server.xml +svc:/network/nis/client:default var/svc/manifest/network/nis/client.xml +svc:/network/nis/client var/svc/manifest/network/nis/client.xml +svc:/network/rpc/nisplus:default var/svc/manifest/network/rpc/nisplus.xml +svc:/network/rpc/nisplus var/svc/manifest/network/rpc/nisplus.xml +svc:/network/rpc/rex:default var/svc/manifest/network/rpc/rex.xml +svc:/network/rpc/rex var/svc/manifest/network/rpc/rex.xml +svc:/network/ntp:default var/svc/manifest/network/ntp.xml +svc:/network/ntp var/svc/manifest/network/ntp.xml +svc:/network/rpc/ocfserv:default var/svc/manifest/network/rpc/ocfserv.xml +svc:/network/rpc/ocfserv var/svc/manifest/network/rpc/ocfserv.xml +svc:/application/print/cleanup:default var/svc/manifest/application/print/cleanup.xml +svc:/application/print/cleanup var/svc/manifest/application/print/cleanup.xml +svc:/application/print/rfc1179:default var/svc/manifest/application/print/rfc1179.xml +svc:/application/print/rfc1179 var/svc/manifest/application/print/rfc1179.xml +svc:/system/picl:default var/svc/manifest/system/picl.xml +svc:/system/picl var/svc/manifest/system/picl.xml +svc:/system/power:default var/svc/manifest/system/power.xml +svc:/system/power var/svc/manifest/system/power.xml +svc:/application/print/server:default var/svc/manifest/application/print/server.xml +svc:/application/print/server var/svc/manifest/application/print/server.xml +svc:/system/rcap:default var/svc/manifest/system/rcap.xml +svc:/system/rcap var/svc/manifest/system/rcap.xml +svc:/network/comsat:default var/svc/manifest/network/comsat.xml +svc:/network/comsat var/svc/manifest/network/comsat.xml +svc:/network/finger:default var/svc/manifest/network/finger.xml +svc:/network/finger var/svc/manifest/network/finger.xml +svc:/network/login:eklogin var/svc/manifest/network/login.xml +svc:/network/login:klogin var/svc/manifest/network/login.xml +svc:/network/login:rlogin var/svc/manifest/network/login.xml +svc:/network/login var/svc/manifest/network/login.xml +svc:/network/rexec:default var/svc/manifest/network/rexec.xml +svc:/network/rexec var/svc/manifest/network/rexec.xml +svc:/network/rpc/rstat:default var/svc/manifest/network/rpc/rstat.xml +svc:/network/rpc/rstat var/svc/manifest/network/rpc/rstat.xml +svc:/network/rpc/rusers:default var/svc/manifest/network/rpc/rusers.xml +svc:/network/rpc/rusers var/svc/manifest/network/rpc/rusers.xml +svc:/network/rpc/spray:default var/svc/manifest/network/rpc/spray.xml +svc:/network/rpc/spray var/svc/manifest/network/rpc/spray.xml +svc:/network/rpc/wall:default var/svc/manifest/network/rpc/wall.xml +svc:/network/rpc/wall var/svc/manifest/network/rpc/wall.xml +svc:/network/shell:kshell var/svc/manifest/network/shell.xml +svc:/network/shell:default var/svc/manifest/network/shell.xml +svc:/network/shell var/svc/manifest/network/shell.xml +svc:/network/talk:default var/svc/manifest/network/talk.xml +svc:/network/talk var/svc/manifest/network/talk.xml +svc:/platform/sun4u/sf880drd:default var/svc/manifest/platform/sun4u/sf880drd.xml +svc:/platform/sun4u/sf880drd var/svc/manifest/platform/sun4u/sf880drd.xml +svc:/network/slp:default var/svc/manifest/network/slp.xml +svc:/network/slp var/svc/manifest/network/slp.xml +svc:/network/smtp:sendmail var/svc/manifest/network/smtp-sendmail.xml +svc:/network/smtp var/svc/manifest/network/smtp-sendmail.xml +svc:/network/ssh:default var/svc/manifest/network/ssh.xml +svc:/network/ssh var/svc/manifest/network/ssh.xml +svc:/application/font/stfsloader:default var/svc/manifest/application/font/stfsloader.xml +svc:/application/font/stfsloader var/svc/manifest/application/font/stfsloader.xml +svc:/network/tname:default var/svc/manifest/network/tname.xml +svc:/network/tname var/svc/manifest/network/tname.xml +svc:/network/telnet:default var/svc/manifest/network/telnet.xml +svc:/network/telnet var/svc/manifest/network/telnet.xml +svc:/network/rpc/smserver:default var/svc/manifest/network/rpc/smserver.xml +svc:/network/rpc/smserver var/svc/manifest/network/rpc/smserver.xml +svc:/application/management/webmin:default var/svc/manifest/application/management/webmin.xml +svc:/application/management/webmin var/svc/manifest/application/management/webmin.xml +svc:/application/x11/x11-server var/svc/manifest/application/x11/x11-server.xml +svc:/application/x11/xfs:default var/svc/manifest/application/x11/xfs.xml +svc:/application/x11/xfs var/svc/manifest/application/x11/xfs.xml +svc:/network/nis/passwd:default var/svc/manifest/network/nis/passwd.xml +svc:/network/nis/passwd var/svc/manifest/network/nis/passwd.xml +svc:/network/nis/server:default var/svc/manifest/network/nis/server.xml +svc:/network/nis/server var/svc/manifest/network/nis/server.xml +svc:/network/nis/update:default var/svc/manifest/network/nis/update.xml +svc:/network/nis/update var/svc/manifest/network/nis/update.xml +svc:/network/nis/xfr:default var/svc/manifest/network/nis/xfr.xml +svc:/network/nis/xfr var/svc/manifest/network/nis/xfr.xml +svc:/system/zones:default var/svc/manifest/system/zones.xml +svc:/system/zones var/svc/manifest/system/zones.xml +svc:/milestone/sysconfig:default var/svc/manifest/milestone/sysconfig.xml +svc:/milestone/sysconfig var/svc/manifest/milestone/sysconfig.xml +svc:/network/iscsi_initiator:default var/svc/manifest/network/iscsi_initiator.xml +svc:/network/iscsi_initiator var/svc/manifest/network/iscsi_initiator.xml +svc:/network/http:apache22 var/svc/manifest/network/http-apache22.xml +svc:/network/http var/svc/manifest/network/http-apache22.xml +svc:/system/avahi-bridge-dsd:default var/svc/manifest/system/avahi-bridge-dsd.xml +svc:/system/avahi-bridge-dsd var/svc/manifest/system/avahi-bridge-dsd.xml +svc:/system/basicreg:default var/svc/manifest/system/br.xml +svc:/system/basicreg var/svc/manifest/system/br.xml +svc:/system/intrd:default var/svc/manifest/system/intrd.xml +svc:/system/intrd var/svc/manifest/system/intrd.xml +svc:/system/scheduler:default var/svc/manifest/system/scheduler.xml +svc:/system/scheduler var/svc/manifest/system/scheduler.xml +svc:/network/datalink-management:default var/svc/manifest/network/dlmgmt.xml +svc:/network/datalink-management var/svc/manifest/network/dlmgmt.xml +svc:/network/ipv4-forwarding:default var/svc/manifest/network/forwarding.xml +svc:/network/ipv6-forwarding:default var/svc/manifest/network/forwarding.xml +svc:/network/ipv4-forwarding var/svc/manifest/network/forwarding.xml +svc:/network/ipv6-forwarding var/svc/manifest/network/forwarding.xml +svc:/network/ipsec/ike:default var/svc/manifest/network/ipsec/ike.xml +svc:/network/ipsec/ike var/svc/manifest/network/ipsec/ike.xml +svc:/network/ipsec/ipsecalgs:default var/svc/manifest/network/ipsec/ipsecalgs.xml +svc:/network/ipsec/ipsecalgs var/svc/manifest/network/ipsec/ipsecalgs.xml +svc:/network/ipsec/manual-key:default var/svc/manifest/network/ipsec/manual-key.xml +svc:/network/ipsec/manual-key var/svc/manifest/network/ipsec/manual-key.xml +svc:/network/ipsec/policy:default var/svc/manifest/network/ipsec/policy.xml +svc:/network/ipsec/policy var/svc/manifest/network/ipsec/policy.xml +svc:/network/physical:nwam var/svc/manifest/network/network-physical.xml +svc:/network/routing-setup:default var/svc/manifest/network/network-routing-setup.xml +svc:/network/routing-setup var/svc/manifest/network/network-routing-setup.xml +svc:/network/routing/legacy-routing:ipv6 var/svc/manifest/network/routing/legacy-routing.xml +svc:/network/routing/legacy-routing:ipv4 var/svc/manifest/network/routing/legacy-routing.xml +svc:/network/routing/legacy-routing var/svc/manifest/network/routing/legacy-routing.xml +svc:/network/shares/group:default var/svc/manifest/network/shares/group.xml +svc:/network/shares/group var/svc/manifest/network/shares/group.xml +svc:/network/ssl/proxy var/svc/manifest/network/ssl/kssl-proxy.xml +svc:/system/auditd:default var/svc/manifest/system/auditd.xml +svc:/system/auditd var/svc/manifest/system/auditd.xml +svc:/system/boot-archive-update:default var/svc/manifest/system/boot-archive-update.xml +svc:/system/boot-archive-update var/svc/manifest/system/boot-archive-update.xml +svc:/system/boot-archive:default var/svc/manifest/system/boot-archive.xml +svc:/system/boot-archive var/svc/manifest/system/boot-archive.xml +svc:/system/console-login:vt6 var/svc/manifest/system/console-login.xml +svc:/system/console-login:vt5 var/svc/manifest/system/console-login.xml +svc:/system/console-login:vt4 var/svc/manifest/system/console-login.xml +svc:/system/console-login:vt3 var/svc/manifest/system/console-login.xml +svc:/system/console-login:vt2 var/svc/manifest/system/console-login.xml +svc:/system/device/mpxio-upgrade:default var/svc/manifest/system/device/mpxio-upgrade.xml +svc:/system/device/mpxio-upgrade var/svc/manifest/system/device/mpxio-upgrade.xml +svc:/system/extended-accounting:task var/svc/manifest/system/extended-accounting.xml +svc:/system/extended-accounting:process var/svc/manifest/system/extended-accounting.xml +svc:/system/extended-accounting:flow var/svc/manifest/system/extended-accounting.xml +svc:/system/extended-accounting var/svc/manifest/system/extended-accounting.xml +svc:/system/idmap:default var/svc/manifest/system/idmap.xml +svc:/system/idmap var/svc/manifest/system/idmap.xml +svc:/system/vtdaemon:default var/svc/manifest/system/vtdaemon.xml +svc:/system/vtdaemon var/svc/manifest/system/vtdaemon.xml +svc:/application/cups/scheduler:default var/svc/manifest/application/cups.xml +svc:/application/cups/in-lpd:default var/svc/manifest/application/cups.xml +svc:/application/cups/scheduler var/svc/manifest/application/cups.xml +svc:/application/cups/in-lpd var/svc/manifest/application/cups.xml +svc:/system/dbus:default var/svc/manifest/system/dbus.xml +svc:/system/dbus var/svc/manifest/system/dbus.xml +svc:/platform/sun4u/oplhpd:default var/svc/manifest/platform/sun4u/oplhpd.xml +svc:/platform/sun4u/oplhpd var/svc/manifest/platform/sun4u/oplhpd.xml +svc:/platform/sun4u/dscp:default var/svc/manifest/platform/sun4u/dscp.xml +svc:/platform/sun4u/dscp var/svc/manifest/platform/sun4u/dscp.xml +svc:/network/dns/multicast:default var/svc/manifest/network/dns/multicast.xml +svc:/network/dns/multicast var/svc/manifest/network/dns/multicast.xml +svc:/application/cde-printinfo:default var/svc/manifest/application/cde-printinfo.xml +svc:/application/cde-printinfo var/svc/manifest/application/cde-printinfo.xml +svc:/network/cde-spc:default var/svc/manifest/network/cde-spc.xml +svc:/network/cde-spc var/svc/manifest/network/cde-spc.xml +svc:/network/rpc/cde-calendar-manager:default var/svc/manifest/network/rpc/cde-cmsd.xml +svc:/network/rpc/cde-calendar-manager var/svc/manifest/network/rpc/cde-cmsd.xml +svc:/network/rpc/cde-ttdbserver:tcp var/svc/manifest/network/rpc/cde-ttdbserverd.xml +svc:/network/rpc/cde-ttdbserver var/svc/manifest/network/rpc/cde-ttdbserverd.xml +svc:/application/graphical-login/cde-login:default var/svc/manifest/application/graphical-login/cde-login.xml +svc:/application/graphical-login/cde-login var/svc/manifest/application/graphical-login/cde-login.xml +svc:/platform/sun4v/efdaemon:default var/svc/manifest/platform/sun4v/efdaemon.xml +svc:/platform/sun4v/efdaemon var/svc/manifest/platform/sun4v/efdaemon.xml +svc:/network/npiv_config:default var/svc/manifest/network/npiv_config.xml +svc:/network/npiv_config var/svc/manifest/network/npiv_config.xml +svc:/system/fpsd:default var/svc/manifest/system/fpsd.xml +svc:/system/fpsd var/svc/manifest/system/fpsd.xml +svc:/application/time-slider:default var/svc/manifest/application/time-slider.xml +svc:/application/time-slider var/svc/manifest/application/time-slider.xml +svc:/network/device-discovery/printers:snmp var/svc/manifest/network/network-discovery.xml +svc:/network/device-discovery/printers var/svc/manifest/network/network-discovery.xml +svc:/system/hal:default var/svc/manifest/system/hal.xml +svc:/system/hal var/svc/manifest/system/hal.xml +svc:/system/nws_ii:default var/svc/manifest/system/nws_ii.xml +svc:/system/nws_ii var/svc/manifest/system/nws_ii.xml +svc:/network/ipmievd:default var/svc/manifest/network/ipmievd.xml +svc:/network/ipmievd var/svc/manifest/network/ipmievd.xml +svc:/system/iscsitgt:default var/svc/manifest/system/iscsi_target.xml +svc:/system/iscsitgt var/svc/manifest/system/iscsi_target.xml +svc:/network/isns_server:default var/svc/manifest/network/isns_server.xml +svc:/network/isns_server var/svc/manifest/network/isns_server.xml +svc:/application/wnn8/server:default var/svc/manifest/application/wnn8/wnn8-server.xml +svc:/application/wnn8/server var/svc/manifest/application/wnn8/wnn8-server.xml +svc:/platform/sun4v/drd:default var/svc/manifest/platform/sun4v/drd.xml +svc:/platform/sun4v/drd var/svc/manifest/platform/sun4v/drd.xml +svc:/ldoms/vntsd:default var/svc/manifest/platform/sun4v/vntsd.xml +svc:/ldoms/vntsd var/svc/manifest/platform/sun4v/vntsd.xml +svc:/network/http:lighttpd14 var/svc/manifest/network/http-lighttpd14.xml +svc:/network/http var/svc/manifest/network/http-lighttpd14.xml +svc:/system/webconsole:console var/svc/manifest/system/webconsole.xml +svc:/system/webconsole var/svc/manifest/system/webconsole.xml +svc:/system/metasync:default var/svc/manifest/system/metasync.xml +svc:/system/metasync var/svc/manifest/system/metasync.xml +svc:/application/database/memcached:default var/svc/manifest/application/database/memcached.xml +svc:/application/database/memcached var/svc/manifest/application/database/memcached.xml +svc:/application/management/mms:mm var/svc/manifest/application/management/mms.xml +svc:/application/management/mms:db var/svc/manifest/application/management/mms.xml +svc:/application/management/mms:wcr var/svc/manifest/application/management/mms.xml +svc:/application/management/mms var/svc/manifest/application/management/mms.xml +svc:/application/database/mysql:version_50 var/svc/manifest/application/database/mysql.xml +svc:/application/database/mysql var/svc/manifest/application/database/mysql.xml +svc:/system/ndmpd:default var/svc/manifest/system/ndmp.xml +svc:/system/ndmpd var/svc/manifest/system/ndmp.xml +svc:/application/database/pgbouncer:default var/svc/manifest/application/database/pgbouncer.xml +svc:/application/database/pgbouncer var/svc/manifest/application/database/pgbouncer.xml +svc:/system/pools/dynamic:default var/svc/manifest/system/poold.xml +svc:/system/pools/dynamic var/svc/manifest/system/poold.xml +svc:/system/pools:default var/svc/manifest/system/pools.xml +svc:/system/pools var/svc/manifest/system/pools.xml +svc:/application/database/postgresql:version_82_64bit var/svc/manifest/application/database/postgresql.xml +svc:/application/database/postgresql:version_82 var/svc/manifest/application/database/postgresql.xml +svc:/application/database/postgresql:version_81 var/svc/manifest/application/database/postgresql.xml +svc:/application/database/postgresql var/svc/manifest/application/database/postgresql.xml +svc:/application/database/postgresql_83:default_64bit var/svc/manifest/application/database/postgresql_83.xml +svc:/application/database/postgresql_83:default_32bit var/svc/manifest/application/database/postgresql_83.xml +svc:/application/database/postgresql_83 var/svc/manifest/application/database/postgresql_83.xml +svc:/system/postrun:default var/svc/manifest/system/postrun.xml +svc:/system/postrun var/svc/manifest/system/postrun.xml +svc:/system/installupdates:default var/svc/manifest/system/installupdates.xml +svc:/system/installupdates var/svc/manifest/system/installupdates.xml +svc:/network/http:privoxy var/svc/manifest/network/http-privoxy.xml +svc:/network/http var/svc/manifest/network/http-privoxy.xml +svc:/application/print/ppd-cache-update:default var/svc/manifest/application/print/ppd-cache-update.xml +svc:/application/print/ppd-cache-update var/svc/manifest/application/print/ppd-cache-update.xml +svc:/network/routing/zebra:quagga var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/rip:quagga var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/ripng:quagga var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/ospf:quagga var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/ospf6:quagga var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/bgp:quagga var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/zebra var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/rip var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/ripng var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/ospf var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/ospf6 var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/bgp var/svc/manifest/network/routing/quagga.xml +svc:/system/nws_rdc:default var/svc/manifest/system/nws_rdc.xml +svc:/system/nws_rdc var/svc/manifest/system/nws_rdc.xml +svc:/system/nws_rdcsyncd:default var/svc/manifest/system/nws_rdcsyncd.xml +svc:/system/nws_rdcsyncd var/svc/manifest/system/nws_rdcsyncd.xml +svc:/system/filesystem/rmvolmgr:default var/svc/manifest/system/filesystem/rmvolmgr.xml +svc:/system/filesystem/rmvolmgr var/svc/manifest/system/filesystem/rmvolmgr.xml +svc:/network/routing/ndp:default var/svc/manifest/network/routing/ndp.xml +svc:/network/routing/ndp var/svc/manifest/network/routing/ndp.xml +svc:/network/routing/rdisc:default var/svc/manifest/network/routing/rdisc.xml +svc:/network/routing/rdisc var/svc/manifest/network/routing/rdisc.xml +svc:/network/routing/ripng:default var/svc/manifest/network/routing/ripng.xml +svc:/network/routing/ripng var/svc/manifest/network/routing/ripng.xml +svc:/network/routing/route:default var/svc/manifest/network/routing/route.xml +svc:/network/routing/route var/svc/manifest/network/routing/route.xml +svc:/application/management/snmpdx:default var/svc/manifest/application/management/snmpdx.xml +svc:/application/management/snmpdx var/svc/manifest/application/management/snmpdx.xml +svc:/platform/sun4u/sckmd:default var/svc/manifest/platform/sun4u/sckmd.xml +svc:/platform/sun4u/sckmd var/svc/manifest/platform/sun4u/sckmd.xml +svc:/system/nws_scm:default var/svc/manifest/system/nws_scm.xml +svc:/system/nws_scm var/svc/manifest/system/nws_scm.xml +svc:/network/stdiscover:default var/svc/manifest/network/stdiscover.xml +svc:/network/stdiscover var/svc/manifest/network/stdiscover.xml +svc:/network/stlisten:default var/svc/manifest/network/stlisten.xml +svc:/network/stlisten var/svc/manifest/network/stlisten.xml +svc:/network/samba:default var/svc/manifest/network/samba.xml +svc:/network/samba var/svc/manifest/network/samba.xml +svc:/network/swat:default var/svc/manifest/network/swat.xml +svc:/network/swat var/svc/manifest/network/swat.xml +svc:/network/winbind:default var/svc/manifest/network/winbind.xml +svc:/network/winbind var/svc/manifest/network/winbind.xml +svc:/network/wins:default var/svc/manifest/network/wins.xml +svc:/network/wins var/svc/manifest/network/wins.xml +svc:/network/smb/client:default var/svc/manifest/network/smb/client.xml +svc:/network/smb/client var/svc/manifest/network/smb/client.xml +svc:/network/smb/server:default var/svc/manifest/network/smb/server.xml +svc:/network/smb/server var/svc/manifest/network/smb/server.xml +svc:/application/management/seaport:default var/svc/manifest/application/management/seaport.xml +svc:/application/management/seaport var/svc/manifest/application/management/seaport.xml +svc:/application/management/sma:default var/svc/manifest/application/management/sma.xml +svc:/application/management/sma var/svc/manifest/application/management/sma.xml +svc:/system/nws_sv:default var/svc/manifest/system/nws_sv.xml +svc:/system/nws_sv var/svc/manifest/system/nws_sv.xml +svc:/network/http:squid var/svc/manifest/network/http-squid.xml +svc:/network/http var/svc/manifest/network/http-squid.xml +svc:/system/stmf:default var/svc/manifest/system/stmf.xml +svc:/system/stmf var/svc/manifest/system/stmf.xml +svc:/application/stosreg:default var/svc/manifest/application/stosreg.xml +svc:/application/stosreg var/svc/manifest/application/stosreg.xml +svc:/network/ssl/stunnel:default var/svc/manifest/network/ssl/stunnel.xml +svc:/network/ssl/stunnel var/svc/manifest/network/ssl/stunnel.xml +svc:/network/tnctl:default var/svc/manifest/network/tnctl.xml +svc:/network/tnctl var/svc/manifest/network/tnctl.xml +svc:/network/tnd:default var/svc/manifest/network/tnd.xml +svc:/network/tnd var/svc/manifest/network/tnd.xml +svc:/system/labeld:default var/svc/manifest/system/labeld.xml +svc:/system/labeld var/svc/manifest/system/labeld.xml +svc:/system/tsol-zones:default var/svc/manifest/system/tsol-zones.xml +svc:/system/tsol-zones var/svc/manifest/system/tsol-zones.xml +svc:/system/filesystem/vscan:icap var/svc/manifest/system/filesystem/vscan.xml +svc:/system/filesystem/vscan var/svc/manifest/system/filesystem/vscan.xml +svc:/application/management/wbem:default var/svc/manifest/application/management/wbem.xml +svc:/application/management/wbem var/svc/manifest/application/management/wbem.xml +svc:/network/wpa var/svc/manifest/network/wpa.xml +svc:/application/x11/xvnc-inetd:default var/svc/manifest/application/x11/xvnc-inetd.xml +svc:/application/x11/xvnc-inetd var/svc/manifest/application/x11/xvnc-inetd.xml +svc:/system/filesystem/zfs/auto-snapshot:daily var/svc/manifest/system/filesystem/auto-snapshot-daily.xml +svc:/system/filesystem/zfs/auto-snapshot:default var/svc/manifest/system/filesystem/auto-snapshot-daily.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/auto-snapshot-daily.xml +svc:/system/filesystem/zfs/auto-snapshot:frequent var/svc/manifest/system/filesystem/auto-snapshot-frequent.xml +svc:/system/filesystem/zfs/auto-snapshot:default var/svc/manifest/system/filesystem/auto-snapshot-frequent.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/auto-snapshot-frequent.xml +svc:/system/filesystem/zfs/auto-snapshot:hourly var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml +svc:/system/filesystem/zfs/auto-snapshot:default var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml +svc:/system/filesystem/zfs/auto-snapshot:monthly var/svc/manifest/system/filesystem/auto-snapshot-monthly.xml +svc:/system/filesystem/zfs/auto-snapshot:default var/svc/manifest/system/filesystem/auto-snapshot-monthly.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/auto-snapshot-monthly.xml +svc:/system/filesystem/zfs/auto-snapshot:weekly var/svc/manifest/system/filesystem/auto-snapshot-weekly.xml +svc:/system/filesystem/zfs/auto-snapshot:default var/svc/manifest/system/filesystem/auto-snapshot-weekly.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/auto-snapshot-weekly.xml +svc:/system/filesystem/zfssnap-roleadd:default var/svc/manifest/system/filesystem/zfs-auto-snapshot-roleadd.xml +svc:/system/filesystem/zfssnap-roleadd var/svc/manifest/system/filesystem/zfs-auto-snapshot-roleadd.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/zfs-auto-snapshot.xml +svc:/system/resource-mgmt:default var/svc/manifest/system/resource-mgmt.xml +svc:/system/resource-mgmt var/svc/manifest/system/resource-mgmt.xml +svc:/network/routing/isis:quagga var/svc/manifest/network/routing/quagga.xml +svc:/network/routing/isis var/svc/manifest/network/routing/quagga.xml +svc:/system/filesystem/zfssnap-roleadd:default var/svc/manifest/system/filesystem/auto-snapshot-roleadd.xml +svc:/system/filesystem/zfssnap-roleadd var/svc/manifest/system/filesystem/auto-snapshot-roleadd.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/auto-snapshot.xml +svc:/system/filesystem/zfs/auto-snapshot:daily var/svc/manifest/system/filesystem/zfs-auto-snapshot-daily.xml +svc:/system/filesystem/zfs/auto-snapshot:default var/svc/manifest/system/filesystem/zfs-auto-snapshot-daily.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/zfs-auto-snapshot-daily.xml +svc:/system/filesystem/zfs/auto-snapshot:frequent var/svc/manifest/system/filesystem/zfs-auto-snapshot-frequent.xml +svc:/system/filesystem/zfs/auto-snapshot:default var/svc/manifest/system/filesystem/zfs-auto-snapshot-frequent.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/zfs-auto-snapshot-frequent.xml +svc:/system/filesystem/zfs/auto-snapshot:hourly var/svc/manifest/system/filesystem/zfs-auto-snapshot-hourly.xml +svc:/system/filesystem/zfs/auto-snapshot:default var/svc/manifest/system/filesystem/zfs-auto-snapshot-hourly.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/zfs-auto-snapshot-hourly.xml +svc:/system/filesystem/zfs/auto-snapshot:monthly var/svc/manifest/system/filesystem/zfs-auto-snapshot-monthly.xml +svc:/system/filesystem/zfs/auto-snapshot:default var/svc/manifest/system/filesystem/zfs-auto-snapshot-monthly.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/zfs-auto-snapshot-monthly.xml +svc:/system/filesystem/zfs/auto-snapshot:weekly var/svc/manifest/system/filesystem/zfs-auto-snapshot-weekly.xml +svc:/system/filesystem/zfs/auto-snapshot:default var/svc/manifest/system/filesystem/zfs-auto-snapshot-weekly.xml +svc:/system/filesystem/zfs/auto-snapshot var/svc/manifest/system/filesystem/zfs-auto-snapshot-weekly.xml +svc:/application/database/javadb:default var/svc/manifest/application/database/javadb.xml +svc:/application/database/javadb var/svc/manifest/application/database/javadb.xml +svc:/system/svc/global:default var/svc/manifest/system/svc/global.xml +svc:/system/svc/global var/svc/manifest/system/svc/global.xml +svc:/system/nws_ii:default var/svc/manifest/system/nws-ii.xml +svc:/system/nws_ii var/svc/manifest/system/nws-ii.xml +svc:/network/ldap/server:openldap_24 var/svc/manifest/network/ldap/ldap-olslapd.xml +svc:/network/ldap/server var/svc/manifest/network/ldap/ldap-olslapd.xml +svc:/network/iscsi/target:default var/svc/manifest/network/iscsi/iscsi-target.xml +svc:/network/iscsi/target var/svc/manifest/network/iscsi/iscsi-target.xml +svc:/system/filesystem/zfs/auto-snapshot:monthly var/svc/manifest/system/filesystem/auto-snapshot.xml +svc:/system/filesystem/zfs/auto-snapshot:weekly var/svc/manifest/system/filesystem/auto-snapshot.xml +svc:/system/filesystem/zfs/auto-snapshot:daily var/svc/manifest/system/filesystem/auto-snapshot.xml +svc:/system/filesystem/zfs/auto-snapshot:hourly var/svc/manifest/system/filesystem/auto-snapshot.xml +svc:/system/filesystem/zfs/auto-snapshot:frequent var/svc/manifest/system/filesystem/auto-snapshot.xml +svc:/network/cimserver:default var/svc/manifest/network/cimserver.xml +svc:/network/cimserver var/svc/manifest/network/cimserver.xml +svc:/system/extended-accounting:net var/svc/manifest/system/extended-accounting.xml +svc:/network/http:tomcat6 var/svc/manifest/network/http-tomcat6.xml +svc:/network/http var/svc/manifest/network/http-tomcat6.xml +svc:/network/sendmail-client:default var/svc/manifest/network/sendmail-client.xml +svc:/network/sendmail-client var/svc/manifest/network/sendmail-client.xml +svc:/application/database/mysql:version_51 var/svc/manifest/application/database/mysql_51.xml +svc:/application/database/mysql var/svc/manifest/application/database/mysql_51.xml +svc:/network/openwsmand:default var/svc/manifest/network/openwsmand.xml +svc:/network/openwsmand var/svc/manifest/network/openwsmand.xml +svc:/network/fcoe_config:default var/svc/manifest/network/fcoe_config.xml +svc:/network/fcoe_config var/svc/manifest/network/fcoe_config.xml +svc:/network/iscsi/initiator:default var/svc/manifest/network/iscsi/iscsi-initiator.xml +svc:/network/iscsi/initiator var/svc/manifest/network/iscsi/iscsi-initiator.xml +svc:/network/loadbalancer/pen:http var/svc/manifest/network/loadbalancer/pen.xml +svc:/network/loadbalancer/pen:default var/svc/manifest/network/loadbalancer/pen.xml +svc:/network/loadbalancer/pen var/svc/manifest/network/loadbalancer/pen.xml +svc:/system/wusbd:default var/svc/manifest/system/wusb.xml +svc:/system/wusbd var/svc/manifest/system/wusb.xml +svc:/system/device/audio:default var/svc/manifest/system/device/devices-audio.xml +svc:/system/device/audio var/svc/manifest/system/device/devices-audio.xml +svc:/application/desktop-cache/desktop-mime-cache:default var/svc/manifest/application/desktop-cache/desktop-mime-cache.xml +svc:/application/desktop-cache/desktop-mime-cache var/svc/manifest/application/desktop-cache/desktop-mime-cache.xml +svc:/application/desktop-cache/gconf-cache:default var/svc/manifest/application/desktop-cache/gconf-cache.xml +svc:/application/desktop-cache/gconf-cache var/svc/manifest/application/desktop-cache/gconf-cache.xml +svc:/application/desktop-cache/icon-cache:default var/svc/manifest/application/desktop-cache/icon-cache.xml +svc:/application/desktop-cache/icon-cache var/svc/manifest/application/desktop-cache/icon-cache.xml +svc:/application/desktop-cache/input-method-cache:default var/svc/manifest/application/desktop-cache/input-method-cache.xml +svc:/application/desktop-cache/input-method-cache var/svc/manifest/application/desktop-cache/input-method-cache.xml +svc:/application/desktop-cache/mime-types-cache:default var/svc/manifest/application/desktop-cache/mime-types-cache.xml +svc:/application/desktop-cache/mime-types-cache var/svc/manifest/application/desktop-cache/mime-types-cache.xml +svc:/application/desktop-cache/pixbuf-loaders-installer:default var/svc/manifest/application/desktop-cache/pixbuf-loaders-installer.xml +svc:/application/desktop-cache/pixbuf-loaders-installer var/svc/manifest/application/desktop-cache/pixbuf-loaders-installer.xml +svc:/system/ibsrp/target:default var/svc/manifest/system/ibsrp/target.xml +svc:/system/ibsrp/target var/svc/manifest/system/ibsrp/target.xml +svc:/network/tor:default var/svc/manifest/network/tor.xml +svc:/network/tor var/svc/manifest/network/tor.xml +svc:/system/conmand:default var/svc/manifest/system/conmand.xml +svc:/system/conmand var/svc/manifest/system/conmand.xml +svc:/application/security/tcsd:default var/svc/manifest/application/security/tcsd.xml +svc:/application/security/tcsd var/svc/manifest/application/security/tcsd.xml +svc:/system/rbac:default var/svc/manifest/system/rbac.xml +svc:/system/rbac var/svc/manifest/system/rbac.xml +svc:/network/xmpp:ejabberd var/svc/manifest/network/xmpp-ejabberd.xml +svc:/network/xmpp var/svc/manifest/network/xmpp-ejabberd.xml +svc:/system/fcoe_target:default var/svc/manifest/system/fcoe_target.xml +svc:/system/fcoe_target var/svc/manifest/system/fcoe_target.xml +svc:/network/snort:default var/svc/manifest/network/snort.xml +svc:/network/snort var/svc/manifest/network/snort.xml +svc:/network/aggregation:default var/svc/manifest/network/aggregation.xml +svc:/network/aggregation var/svc/manifest/network/aggregation.xml +svc:/network/datalink-init:default var/svc/manifest/network/datalink-init.xml +svc:/network/datalink-init var/svc/manifest/network/datalink-init.xml +svc:/network/datalink:default var/svc/manifest/network/datalink.xml +svc:/network/datalink var/svc/manifest/network/datalink.xml +svc:/system/boot-config:default var/svc/manifest/system/boot-config.xml +svc:/system/boot-config var/svc/manifest/system/boot-config.xml +svc:/application/management/net-snmp:default var/svc/manifest/application/management/net-snmp.xml +svc:/application/management/net-snmp var/svc/manifest/application/management/net-snmp.xml +svc:/system/fcoe_initiator:default var/svc/manifest/system/fcoe_initiator.xml +svc:/system/fcoe_initiator var/svc/manifest/system/fcoe_initiator.xml +svc:/system/freeipmi/bmc-watchdog:default var/svc/manifest/system/bmc-watchdog.xml +svc:/system/freeipmi/bmc-watchdog var/svc/manifest/system/bmc-watchdog.xml +svc:/system/freeipmi/ipmidetectd:default var/svc/manifest/system/ipmidetectd.xml +svc:/system/freeipmi/ipmidetectd var/svc/manifest/system/ipmidetectd.xml +svc:/system/boot-archive:default var/svc/manifest/system/filesystem/boot-archive.xml +svc:/system/boot-archive var/svc/manifest/system/filesystem/boot-archive.xml +svc:/application/dtprintinfo:default var/svc/manifest/application/dtprintinfo.xml +svc:/application/dtprintinfo var/svc/manifest/application/dtprintinfo.xml +svc:/network/dtspc:default var/svc/manifest/network/dtspc.xml +svc:/network/dtspc var/svc/manifest/network/dtspc.xml +svc:/network/rpc/calendar-manager:udp var/svc/manifest/network/rpc/cmsd.xml +svc:/network/rpc/calendar-manager var/svc/manifest/network/rpc/cmsd.xml +svc:/network/rpc/ttdbserver:tcp var/svc/manifest/network/rpc/ttdbserverd.xml +svc:/network/rpc/ttdbserver var/svc/manifest/network/rpc/ttdbserverd.xml +svc:/application/graphical-login/dtlogin:default var/svc/manifest/application/graphical-login/dtlogin.xml +svc:/application/graphical-login/dtlogin var/svc/manifest/application/graphical-login/dtlogin.xml +svc:/system/filesystem/volfs:default var/svc/manifest/system/filesystem/volfs.xml +svc:/system/filesystem/volfs var/svc/manifest/system/filesystem/volfs.xml +svc:/application/smcwbem:default var/svc/manifest/application/smcwbem.xml +svc:/application/smcwbem var/svc/manifest/application/smcwbem.xml +svc:/application/graphical-login/gdm:default var/svc/manifest/application/graphical-login/gdm.xml +svc:/application/graphical-login/gdm var/svc/manifest/application/graphical-login/gdm.xml +svc:/network/http:apache22 var/svc/manifest/network/http-apache2.xml +svc:/platform/i86pc/eeprom:default var/svc/manifest/platform/i86pc/eeprom.xml +svc:/platform/i86pc/eeprom var/svc/manifest/platform/i86pc/eeprom.xml +svc:/platform/i86pc/kdmconfig:default var/svc/manifest/platform/i86pc/kdmconfig.xml +svc:/platform/i86pc/kdmconfig var/svc/manifest/platform/i86pc/kdmconfig.xml +svc:/system/hostid:default var/svc/manifest/system/hostid.xml +svc:/system/hostid var/svc/manifest/system/hostid.xml +svc:/system/xvm/virtd:default var/svc/manifest/system/xvm/virtd.xml +svc:/system/xvm/virtd var/svc/manifest/system/xvm/virtd.xml +svc:/system/xvm/console:default var/svc/manifest/system/xvm/console.xml +svc:/system/xvm/console var/svc/manifest/system/xvm/console.xml +svc:/system/xvm/domains:default var/svc/manifest/system/xvm/domains.xml +svc:/system/xvm/domains var/svc/manifest/system/xvm/domains.xml +svc:/system/xvm/store:default var/svc/manifest/system/xvm/store.xml +svc:/system/xvm/store var/svc/manifest/system/xvm/store.xml +svc:/system/xvm/xend:default var/svc/manifest/system/xvm/xend.xml +svc:/system/xvm/xend var/svc/manifest/system/xvm/xend.xml +svc:/application/opengl/ogl-select:default var/svc/manifest/application/opengl/ogl-select.xml +svc:/application/opengl/ogl-select var/svc/manifest/application/opengl/ogl-select.xml +svc:/network/rpc/bootparams var/svc/manifest/network/rpc/bootparams.xml +svc:/system/pkgserv:default var/svc/manifest/system/pkgserv.xml +svc:/system/pkgserv var/svc/manifest/system/pkgserv.xml +svc:/system/xvm/ipagent:default var/svc/manifest/system/ipagent.xml +svc:/system/xvm/ipagent var/svc/manifest/system/ipagent.xml +svc:/network/lms:default var/svc/manifest/network/lms.xml +svc:/network/lms var/svc/manifest/network/lms.xml
--- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c Mon Sep 28 17:05:18 2009 -0700 +++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c Mon Sep 28 18:11:46 2009 -0700 @@ -3303,13 +3303,14 @@ * */ static int -upgrade_manifestfiles(const entity_t *ient, const scf_snaplevel_t *running, - void *ent) -{ - scf_propertygroup_t *ud_run_mfsts_pg = NULL; - scf_property_t *ud_run_prop = NULL; +upgrade_manifestfiles(pgroup_t *pg, const entity_t *ient, + const scf_snaplevel_t *running, void *ent) +{ + scf_propertygroup_t *ud_mfsts_pg = NULL; + scf_property_t *ud_prop = NULL; scf_iter_t *ud_prop_iter; scf_value_t *fname_value; + scf_callback_t cbdata; pgroup_t *mfst_pgroup; property_t *mfst_prop; property_t *old_prop; @@ -3317,6 +3318,7 @@ char *fval; char *old_pname; char *old_fval; + int no_upgrade_pg; int mfst_seen; int r; @@ -3327,22 +3329,19 @@ * path, and the fact that the manifests pg is a service * level property group only. */ - ud_run_mfsts_pg = scf_pg_create(g_hndl); - ud_run_prop = scf_property_create(g_hndl); + ud_mfsts_pg = scf_pg_create(g_hndl); + ud_prop = scf_property_create(g_hndl); ud_prop_iter = scf_iter_create(g_hndl); fname_value = scf_value_create(g_hndl); - /* Fetch the running version of the "manifests" property group */ - if (running != NULL) - r = scf_snaplevel_get_pg(running, SCF_PG_MANIFESTFILES, - ud_run_mfsts_pg); - else - r = entity_get_pg(ent, issvc, SCF_PG_MANIFESTFILES, - ud_run_mfsts_pg); - + /* Fetch the "manifests" property group */ + no_upgrade_pg = 0; + r = entity_get_pg(ent, issvc, SCF_PG_MANIFESTFILES, + ud_mfsts_pg); if (r != 0) { switch (scf_error()) { case SCF_ERROR_NOT_FOUND: + no_upgrade_pg = 1; break; case SCF_ERROR_DELETED: @@ -3359,6 +3358,20 @@ } } + if (no_upgrade_pg) { + cbdata.sc_handle = g_hndl; + cbdata.sc_parent = ent; + cbdata.sc_service = issvc; + cbdata.sc_flags = SCI_FORCE; + cbdata.sc_source_fmri = ient->sc_fmri; + cbdata.sc_target_fmri = ient->sc_fmri; + + if (entity_pgroup_import(pg, &cbdata) != UU_WALK_NEXT) + return (cbdata.sc_err); + + return (0); + } + /* Fetch the new manifests property group */ for (mfst_pgroup = uu_list_first(ient->sc_pgroups); mfst_pgroup != NULL; @@ -3368,13 +3381,13 @@ break; } - if (scf_iter_pg_properties(ud_prop_iter, ud_run_mfsts_pg) != + if ((r = scf_iter_pg_properties(ud_prop_iter, ud_mfsts_pg)) != SCF_SUCCESS) return (-1); - while ((r = scf_iter_next_property(ud_prop_iter, ud_run_prop)) == 1) { + while ((r = scf_iter_next_property(ud_prop_iter, ud_prop)) == 1) { mfst_seen = 0; - if (scf_property_get_name(ud_run_prop, pname, MAXPATHLEN) < 0) + if (scf_property_get_name(ud_prop, pname, MAXPATHLEN) < 0) continue; for (mfst_prop = uu_list_first(mfst_pgroup->sc_pgroup_props); @@ -3395,11 +3408,11 @@ /* * If we cannot get the value then there is no - * reasont to attempt to attach the value to + * reason to attempt to attach the value to * the property group */ if (fval != NULL && - prop_get_val(ud_run_prop, fname_value) == 0 && + prop_get_val(ud_prop, fname_value) == 0 && scf_value_get_astring(fname_value, fval, MAXPATHLEN) != -1) { /* @@ -3410,6 +3423,7 @@ free(fval); continue; } + old_pname = safe_strdup(pname); old_fval = safe_strdup(fval); old_prop = internal_property_create(old_pname, @@ -3425,6 +3439,16 @@ } } + cbdata.sc_handle = g_hndl; + cbdata.sc_parent = ent; + cbdata.sc_service = issvc; + cbdata.sc_flags = SCI_FORCE; + cbdata.sc_source_fmri = ient->sc_fmri; + cbdata.sc_target_fmri = ient->sc_fmri; + + if (entity_pgroup_import(mfst_pgroup, &cbdata) != UU_WALK_NEXT) + return (cbdata.sc_err); + return (r); } @@ -4840,8 +4864,7 @@ return (upgrade_dependents(lipg, imp_snpl, ient, running, ent)); if (strcmp(imp_str, SCF_PG_MANIFESTFILES) == 0) - if ((r = upgrade_manifestfiles(ient, running, ent)) != 0) - return (r); + return (upgrade_manifestfiles(NULL, ient, running, ent)); if (mpg == NULL || mpg->sc_pgroup_delete) { /* property group was deleted from manifest */ @@ -5378,12 +5401,39 @@ continue; } - if (running != NULL) + if (strcmp(pg->sc_pgroup_name, SCF_PG_MANIFESTFILES) == 0) { + r = upgrade_manifestfiles(pg, ient, running, ent); + switch (r) { + case 0: + break; + + case ECONNABORTED: + case ENOMEM: + case ENOSPC: + case ECANCELED: + case ENODEV: + case EBADF: + case EBUSY: + case EINVAL: + case EPERM: + case EROFS: + case EACCES: + case EEXIST: + return (r); + + default: + bad_error("upgrade_manifestfiles", r); + } + continue; + } + + if (running != NULL) { r = scf_snaplevel_get_pg(running, pg->sc_pgroup_name, imp_pg); - else + } else { r = entity_get_pg(ent, issvc, pg->sc_pgroup_name, imp_pg); + } if (r != 0) { scf_callback_t cbdata;
--- a/usr/src/pkgdefs/SUNWcsr/prototype_com Mon Sep 28 17:05:18 2009 -0700 +++ b/usr/src/pkgdefs/SUNWcsr/prototype_com Mon Sep 28 18:11:46 2009 -0700 @@ -394,6 +394,7 @@ f none lib/svc/share/net_include.sh 0444 root bin f none lib/svc/share/routing_include.sh 0444 root bin f none lib/svc/share/smf_include.sh 0444 root bin +f none lib/svc/share/mfsthistory 0444 root bin f none lib/svc/share/manifest_cleanup.ksh 0444 root bin d none mnt 755 root sys d none opt 755 root sys