diff options
| author | Tom Whitten <Thomas.Whitten@Sun.COM> | 2010-03-25 14:57:35 -0700 |
|---|---|---|
| committer | Tom Whitten <Thomas.Whitten@Sun.COM> | 2010-03-25 14:57:35 -0700 |
| commit | 9444c26f4faabda140242c3986089704c4073ced (patch) | |
| tree | 9e367f2f58dc2b2daa66ea7d430e35d834d913b8 /usr/src/pkg | |
| parent | e765faef9c0385c419aa16d67aa529de3c41ac01 (diff) | |
| download | illumos-joyent-9444c26f4faabda140242c3986089704c4073ced.tar.gz | |
PSARC 2010/013 SMF Early Manifest Import
6503835 manifest-import should be done earlier in boot
Diffstat (limited to 'usr/src/pkg')
73 files changed, 468 insertions, 535 deletions
diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf index 19a5ec6bfb..af8d0d9d59 100644 --- a/usr/src/pkg/manifests/SUNWcs.mf +++ b/usr/src/pkg/manifests/SUNWcs.mf @@ -77,6 +77,7 @@ dir path=etc/security/prof_attr.d group=sys dir path=etc/security/spool group=sys dir path=etc/skel group=sys dir path=etc/svc group=sys +dir path=etc/svc/profile group=sys dir path=etc/svc/volatile group=sys dir path=etc/sysevent group=sys dir path=etc/sysevent/config group=sys @@ -92,6 +93,28 @@ dir path=lib/svc/method dir path=lib/svc/monitor dir path=lib/svc/seed dir path=lib/svc/share +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/application group=sys +dir path=lib/svc/manifest/application/management group=sys +dir path=lib/svc/manifest/application/security group=sys +dir path=lib/svc/manifest/device group=sys +dir path=lib/svc/manifest/milestone group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/dns group=sys +dir path=lib/svc/manifest/network/ipsec group=sys +dir path=lib/svc/manifest/network/ldap group=sys +dir path=lib/svc/manifest/network/routing group=sys +dir path=lib/svc/manifest/network/rpc group=sys +dir path=lib/svc/manifest/network/shares group=sys +dir path=lib/svc/manifest/network/ssl group=sys +dir path=lib/svc/manifest/platform group=sys +$(sparc_ONLY)dir path=lib/svc/manifest/platform/sun4u group=sys +dir path=lib/svc/manifest/site group=sys +dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/manifest/system/device group=sys +dir path=lib/svc/manifest/system/filesystem group=sys +dir path=lib/svc/manifest/system/security group=sys +dir path=lib/svc/manifest/system/svc group=sys dir path=mnt group=sys dir path=opt group=sys dir path=proc group=root mode=0555 @@ -289,6 +312,7 @@ dir path=var/svc/log group=sys dir path=var/svc/manifest group=sys dir path=var/svc/manifest/application group=sys dir path=var/svc/manifest/application/management group=sys +dir path=var/svc/manifest/application/print group=sys dir path=var/svc/manifest/application/security group=sys dir path=var/svc/manifest/device group=sys dir path=var/svc/manifest/milestone group=sys @@ -296,18 +320,22 @@ dir path=var/svc/manifest/network group=sys dir path=var/svc/manifest/network/dns group=sys dir path=var/svc/manifest/network/ipsec group=sys dir path=var/svc/manifest/network/ldap group=sys -dir path=var/svc/manifest/network/routing group=sys +dir path=var/svc/manifest/network/nfs group=sys +dir path=var/svc/manifest/network/nis group=sys dir path=var/svc/manifest/network/rpc group=sys +dir path=var/svc/manifest/network/routing group=sys +dir path=var/svc/manifest/network/security group=sys dir path=var/svc/manifest/network/shares group=sys dir path=var/svc/manifest/network/ssl group=sys dir path=var/svc/manifest/platform group=sys $(sparc_ONLY)dir path=var/svc/manifest/platform/sun4u group=sys -dir path=var/svc/manifest/site group=sys +$(sparc_ONLY)dir path=var/svc/manifest/platform/sun4v group=sys dir path=var/svc/manifest/system group=sys dir path=var/svc/manifest/system/device group=sys dir path=var/svc/manifest/system/filesystem group=sys dir path=var/svc/manifest/system/security group=sys dir path=var/svc/manifest/system/svc group=sys +dir path=var/svc/manifest/site group=sys dir path=var/svc/profile group=sys dir path=var/tmp group=sys mode=1777 driver name=dump perms="dump 0660 root sys" @@ -462,7 +490,6 @@ file path=lib/inet/netcfgd mode=0555 file path=lib/inet/nwamd mode=0555 file path=lib/svc/bin/lsvcrun group=sys mode=0555 file path=lib/svc/bin/mfstscan group=sys mode=0555 -file path=lib/svc/bin/prophist group=sys mode=0555 file path=lib/svc/bin/restore_repository group=sys mode=0555 file path=lib/svc/bin/sqlite group=sys mode=0555 file path=lib/svc/bin/svc.configd group=sys mode=0555 @@ -516,7 +543,6 @@ file path=lib/svc/seed/nonglobal.db group=sys mode=0444 file path=lib/svc/share/README mode=0444 file path=lib/svc/share/fs_include.sh mode=0444 file path=lib/svc/share/ipf_include.sh mode=0444 -file path=lib/svc/share/manifest_cleanup.ksh mode=0444 file path=lib/svc/share/mfsthistory mode=0444 file path=lib/svc/share/net_include.sh mode=0444 file path=lib/svc/share/routing_include.sh mode=0444 @@ -1887,95 +1913,95 @@ file path=var/sadm/system/admin/default_java group=sys mode=0444 file path=var/saf/zsmon/log group=sys preserve=true file path=var/spool/cron/crontabs/adm group=sys mode=0600 preserve=true file path=var/spool/cron/crontabs/root group=sys mode=0600 preserve=true -file path=var/svc/manifest/milestone/multi-user-server.xml group=sys mode=0444 -file path=var/svc/manifest/milestone/multi-user.xml group=sys mode=0444 -file path=var/svc/manifest/milestone/name-services.xml group=sys mode=0444 -file path=var/svc/manifest/milestone/network.xml group=sys mode=0444 -file path=var/svc/manifest/milestone/single-user.xml group=sys mode=0444 -file path=var/svc/manifest/milestone/sysconfig.xml group=sys mode=0444 -file path=var/svc/manifest/network/dlmgmt.xml group=sys mode=0444 -file path=var/svc/manifest/network/dns/client.xml group=sys mode=0444 -file path=var/svc/manifest/network/forwarding.xml group=sys mode=0444 -file path=var/svc/manifest/network/inetd-upgrade.xml group=sys mode=0444 -file path=var/svc/manifest/network/inetd.xml group=sys mode=0444 -file path=var/svc/manifest/network/ipsec/ike.xml group=sys mode=0444 -file path=var/svc/manifest/network/ipsec/ipsecalgs.xml group=sys mode=0444 -file path=var/svc/manifest/network/ipsec/manual-key.xml group=sys mode=0444 -file path=var/svc/manifest/network/ipsec/policy.xml group=sys mode=0444 -file path=var/svc/manifest/network/ldap/client.xml group=sys mode=0444 -file path=var/svc/manifest/network/network-initial.xml group=sys mode=0444 -file path=var/svc/manifest/network/network-ipqos.xml group=sys mode=0444 -file path=var/svc/manifest/network/network-iptun.xml group=sys mode=0444 -file path=var/svc/manifest/network/network-location.xml group=sys mode=0444 -file path=var/svc/manifest/network/network-loopback.xml group=sys mode=0444 -file path=var/svc/manifest/network/network-netcfg.xml group=sys mode=0444 -file path=var/svc/manifest/network/network-netmask.xml group=sys mode=0444 -file path=var/svc/manifest/network/network-physical.xml group=sys mode=0444 -file path=var/svc/manifest/network/network-routing-setup.xml group=sys mode=0444 -file path=var/svc/manifest/network/network-service.xml group=sys mode=0444 -file path=var/svc/manifest/network/routing/legacy-routing.xml group=sys \ +file path=lib/svc/manifest/milestone/multi-user-server.xml group=sys mode=0444 +file path=lib/svc/manifest/milestone/multi-user.xml group=sys mode=0444 +file path=lib/svc/manifest/milestone/name-services.xml group=sys mode=0444 +file path=lib/svc/manifest/milestone/network.xml group=sys mode=0444 +file path=lib/svc/manifest/milestone/single-user.xml group=sys mode=0444 +file path=lib/svc/manifest/milestone/sysconfig.xml group=sys mode=0444 +file path=lib/svc/manifest/network/dlmgmt.xml group=sys mode=0444 +file path=lib/svc/manifest/network/dns/client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/forwarding.xml group=sys mode=0444 +file path=lib/svc/manifest/network/inetd-upgrade.xml group=sys mode=0444 +file path=lib/svc/manifest/network/inetd.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ipsec/ike.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ipsec/ipsecalgs.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ipsec/manual-key.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ipsec/policy.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ldap/client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-initial.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-ipqos.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-iptun.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-location.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-loopback.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-netcfg.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-netmask.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-physical.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-routing-setup.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-service.xml group=sys mode=0444 +file path=lib/svc/manifest/network/routing/legacy-routing.xml group=sys \ mode=0444 -file path=var/svc/manifest/network/rpc/bind.xml group=sys mode=0444 -file path=var/svc/manifest/network/rpc/keyserv.xml group=sys mode=0444 -file path=var/svc/manifest/network/shares/group.xml group=sys mode=0444 -file path=var/svc/manifest/network/shares/reparsed.xml group=sys mode=0444 -file path=var/svc/manifest/network/ssl/kssl-proxy.xml group=sys mode=0444 -file path=var/svc/manifest/system/auditd.xml group=sys mode=0444 -file path=var/svc/manifest/system/boot-archive-update.xml group=sys mode=0444 -file path=var/svc/manifest/system/boot-archive.xml group=sys mode=0444 -file path=var/svc/manifest/system/boot-config.xml group=sys mode=0444 -file path=var/svc/manifest/system/consadm.xml group=sys mode=0444 -file path=var/svc/manifest/system/console-login.xml group=sys mode=0444 -file path=var/svc/manifest/system/coreadm.xml group=sys mode=0444 -file path=var/svc/manifest/system/cron.xml group=sys mode=0444 -file path=var/svc/manifest/system/cryptosvc.xml group=sys mode=0444 -file path=var/svc/manifest/system/device/devices-audio.xml group=sys mode=0444 -file path=var/svc/manifest/system/device/devices-local.xml group=sys mode=0444 -file path=var/svc/manifest/system/device/mpxio-upgrade.xml group=sys mode=0444 -file path=var/svc/manifest/system/extended-accounting.xml group=sys mode=0444 -file path=var/svc/manifest/system/filesystem/local-fs.xml group=sys mode=0444 -file path=var/svc/manifest/system/filesystem/minimal-fs.xml group=sys mode=0444 -file path=var/svc/manifest/system/filesystem/root-fs.xml group=sys mode=0444 -file path=var/svc/manifest/system/filesystem/usr-fs.xml group=sys mode=0444 -$(i386_ONLY)file path=var/svc/manifest/system/hostid.xml group=sys mode=0444 -file path=var/svc/manifest/system/hotplug.xml group=sys mode=0444 -file path=var/svc/manifest/system/identity.xml group=sys mode=0444 -file path=var/svc/manifest/system/idmap.xml group=sys mode=0444 -file path=var/svc/manifest/system/keymap.xml group=sys mode=0444 -file path=var/svc/manifest/system/manifest-import.xml group=sys mode=0444 -file path=var/svc/manifest/system/name-service-cache.xml group=sys mode=0444 -file path=var/svc/manifest/system/rbac.xml group=sys mode=0444 -file path=var/svc/manifest/system/rmtmpfiles.xml group=sys mode=0444 -file path=var/svc/manifest/system/sac.xml group=sys mode=0444 -file path=var/svc/manifest/system/svc/global.xml group=sys mode=0444 -file path=var/svc/manifest/system/svc/restarter.xml group=sys mode=0444 -file path=var/svc/manifest/system/system-log.xml group=sys mode=0444 -file path=var/svc/manifest/system/utmp.xml group=sys mode=0444 -file path=var/svc/manifest/system/vtdaemon.xml group=sys mode=0444 -file path=var/svc/profile/generic_limited_net.xml group=sys mode=0444 -file path=var/svc/profile/generic_open.xml group=sys mode=0444 -file path=var/svc/profile/inetd_generic.xml group=sys mode=0444 -file path=var/svc/profile/inetd_upgrade.xml group=sys mode=0444 -file path=var/svc/profile/ns_dns.xml group=sys mode=0444 -file path=var/svc/profile/ns_files.xml group=sys mode=0444 -file path=var/svc/profile/ns_ldap.xml group=sys mode=0444 -file path=var/svc/profile/ns_nis.xml group=sys mode=0444 -file path=var/svc/profile/ns_none.xml group=sys mode=0444 -$(sparc_ONLY)file path=var/svc/profile/platform_SUNW,SPARC-Enterprise.xml \ +file path=lib/svc/manifest/network/rpc/bind.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/keyserv.xml group=sys mode=0444 +file path=lib/svc/manifest/network/shares/group.xml group=sys mode=0444 +file path=lib/svc/manifest/network/shares/reparsed.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ssl/kssl-proxy.xml group=sys mode=0444 +file path=lib/svc/manifest/system/auditd.xml group=sys mode=0444 +file path=lib/svc/manifest/system/boot-archive-update.xml group=sys mode=0444 +file path=lib/svc/manifest/system/boot-archive.xml group=sys mode=0444 +file path=lib/svc/manifest/system/boot-config.xml group=sys mode=0444 +file path=lib/svc/manifest/system/consadm.xml group=sys mode=0444 +file path=lib/svc/manifest/system/console-login.xml group=sys mode=0444 +file path=lib/svc/manifest/system/coreadm.xml group=sys mode=0444 +file path=lib/svc/manifest/system/cron.xml group=sys mode=0444 +file path=lib/svc/manifest/system/cryptosvc.xml group=sys mode=0444 +file path=lib/svc/manifest/system/device/devices-audio.xml group=sys mode=0444 +file path=lib/svc/manifest/system/device/devices-local.xml group=sys mode=0444 +file path=lib/svc/manifest/system/device/mpxio-upgrade.xml group=sys mode=0444 +file path=lib/svc/manifest/system/extended-accounting.xml group=sys mode=0444 +file path=lib/svc/manifest/system/filesystem/local-fs.xml group=sys mode=0444 +file path=lib/svc/manifest/system/filesystem/minimal-fs.xml group=sys mode=0444 +file path=lib/svc/manifest/system/filesystem/root-fs.xml group=sys mode=0444 +file path=lib/svc/manifest/system/filesystem/usr-fs.xml group=sys mode=0444 +$(i386_ONLY)file path=lib/svc/manifest/system/hostid.xml group=sys mode=0444 +file path=lib/svc/manifest/system/hotplug.xml group=sys mode=0444 +file path=lib/svc/manifest/system/identity.xml group=sys mode=0444 +file path=lib/svc/manifest/system/idmap.xml group=sys mode=0444 +file path=lib/svc/manifest/system/keymap.xml group=sys mode=0444 +file path=lib/svc/manifest/system/early-manifest-import.xml group=sys mode=0444 +file path=lib/svc/manifest/system/manifest-import.xml group=sys mode=0444 +file path=lib/svc/manifest/system/name-service-cache.xml group=sys mode=0444 +file path=lib/svc/manifest/system/rbac.xml group=sys mode=0444 +file path=lib/svc/manifest/system/rmtmpfiles.xml group=sys mode=0444 +file path=lib/svc/manifest/system/sac.xml group=sys mode=0444 +file path=lib/svc/manifest/system/svc/global.xml group=sys mode=0444 +file path=lib/svc/manifest/system/svc/restarter.xml group=sys mode=0444 +file path=lib/svc/manifest/system/system-log.xml group=sys mode=0444 +file path=lib/svc/manifest/system/utmp.xml group=sys mode=0444 +file path=lib/svc/manifest/system/vtdaemon.xml group=sys mode=0444 +file path=etc/svc/profile/generic_limited_net.xml group=sys mode=0444 +file path=etc/svc/profile/generic_open.xml group=sys mode=0444 +file path=etc/svc/profile/inetd_generic.xml group=sys mode=0444 +file path=etc/svc/profile/inetd_upgrade.xml group=sys mode=0444 +file path=etc/svc/profile/ns_dns.xml group=sys mode=0444 +file path=etc/svc/profile/ns_files.xml group=sys mode=0444 +file path=etc/svc/profile/ns_ldap.xml group=sys mode=0444 +file path=etc/svc/profile/ns_nis.xml group=sys mode=0444 +file path=etc/svc/profile/ns_none.xml group=sys mode=0444 +$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,SPARC-Enterprise.xml \ group=sys mode=0444 -$(sparc_ONLY)file path=var/svc/profile/platform_SUNW,Sun-Fire-15000.xml \ +$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire-15000.xml \ group=sys mode=0444 -$(sparc_ONLY)file path=var/svc/profile/platform_SUNW,Sun-Fire-880.xml group=sys \ +$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire-880.xml group=sys \ mode=0444 -$(sparc_ONLY)file path=var/svc/profile/platform_SUNW,Sun-Fire.xml group=sys \ +$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire.xml group=sys \ mode=0444 -$(sparc_ONLY)file path=var/svc/profile/platform_SUNW,Ultra-Enterprise-10000.xml \ +$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Ultra-Enterprise-10000.xml \ group=sys mode=0444 -$(sparc_ONLY)file path=var/svc/profile/platform_SUNW,UltraSPARC-IIi-Netract.xml \ +$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,UltraSPARC-IIi-Netract.xml \ group=sys mode=0444 -file path=var/svc/profile/platform_none.xml group=sys mode=0444 -$(sparc_ONLY)file path=var/svc/profile/platform_sun4v.xml group=sys mode=0444 -file path=var/svc/profile/prophist.SUNWcsr group=sys mode=0444 +file path=etc/svc/profile/platform_none.xml group=sys mode=0444 +$(sparc_ONLY)file path=etc/svc/profile/platform_sun4v.xml group=sys mode=0444 hardlink path=etc/crypto/certs/SUNWObjectCA \ target=../../../etc/certs/SUNWObjectCA hardlink path=etc/rc2.d/S20sysetup target=../../etc/init.d/sysetup @@ -2483,13 +2509,13 @@ hardlink path=usr/share/lib/zoneinfo/W-SU \ target=../../../../usr/share/lib/zoneinfo/Europe/Moscow hardlink path=usr/share/lib/zoneinfo/Zulu \ target=../../../../usr/share/lib/zoneinfo/Etc/UTC -$(sparc_ONLY)hardlink path=var/svc/profile/platform_SUNW,Sun-Fire-V890.xml \ +$(sparc_ONLY)hardlink path=etc/svc/profile/platform_SUNW,Sun-Fire-V890.xml \ target=./platform_SUNW,Sun-Fire-880.xml $(sparc_ONLY)hardlink \ - path=var/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml \ + path=etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml \ target=./platform_SUNW,UltraSPARC-IIi-Netract.xml $(sparc_ONLY)hardlink \ - path=var/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-60.xml \ + path=etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-60.xml \ target=./platform_SUNW,UltraSPARC-IIi-Netract.xml legacy pkg=SUNWcsr arch=$(ARCH) category=system \ desc="core software for a specific instruction-set architecture" \ diff --git a/usr/src/pkg/manifests/SUNWcsd.mf b/usr/src/pkg/manifests/SUNWcsd.mf index 3e68fd6f1b..c93f2b6e9d 100644 --- a/usr/src/pkg/manifests/SUNWcsd.mf +++ b/usr/src/pkg/manifests/SUNWcsd.mf @@ -60,10 +60,8 @@ dir path=etc/security group=sys dir path=lib dir path=lib/svc dir path=lib/svc/method -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys file path=etc/dacf.conf group=sys file path=etc/devlink.tab group=sys preserve=true file path=etc/driver_aliases group=sys preserve=true @@ -77,7 +75,7 @@ file path=etc/path_to_inst group=root mode=0444 preserve=true file path=etc/security/device_policy group=sys preserve=true file path=etc/security/extra_privs group=sys preserve=true file path=lib/svc/method/svc-syseventd mode=0555 -file path=var/svc/manifest/system/sysevent.xml group=sys mode=0444 +file path=lib/svc/manifest/system/sysevent.xml group=sys mode=0444 legacy pkg=SUNWcsd arch=$(ARCH) category=system \ desc="core entries for /dev and /devices needed for the initial boot of Solaris" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-srpt.mf b/usr/src/pkg/manifests/driver-network-srpt.mf index 1eb4f701e1..b1d28be2be 100644 --- a/usr/src/pkg/manifests/driver-network-srpt.mf +++ b/usr/src/pkg/manifests/driver-network-srpt.mf @@ -48,14 +48,11 @@ dir path=usr/lib dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/system/ibsrp group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system/ibsrp group=sys opensolaris.zone=global \ variant.opensolaris.zone=global driver name=srpt perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/srpt group=sys opensolaris.zone=global \ @@ -72,7 +69,7 @@ file path=lib/svc/method/svc-srpt mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global file path=usr/lib/mdb/kvm/$(ARCH64)/srpt.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/srpt.so group=sys mode=0555 -file path=var/svc/manifest/system/ibsrp/target.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/ibsrp/target.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWsrptr arch=$(ARCH) category=system \ desc="Sun SRP COMSTAR Port Provider (Root)" \ diff --git a/usr/src/pkg/manifests/driver-storage-sv.mf b/usr/src/pkg/manifests/driver-storage-sv.mf index 0aafc6760a..9b521ee156 100644 --- a/usr/src/pkg/manifests/driver-storage-sv.mf +++ b/usr/src/pkg/manifests/driver-storage-sv.mf @@ -61,10 +61,8 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys driver name=sv devlink=type=ddi_pseudo;name=sv\t\D perms="* 0666 root sys" \ privs=sys_config privs=sys_devices file path=etc/init.d/sv mode=0744 @@ -79,7 +77,7 @@ $(i386_ONLY)file path=usr/kernel/drv/sv group=sys file path=usr/kernel/drv/sv.conf group=sys file path=usr/lib/mdb/kvm/$(ARCH64)/sv.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/sv.so group=sys mode=0555 -file path=var/svc/manifest/system/nws_sv.xml group=sys mode=0444 +file path=lib/svc/manifest/system/nws_sv.xml group=sys mode=0444 hardlink path=lib/svc/method/svc-sv target=../../../etc/init.d/sv hardlink path=usr/sbin/svadm target=../bin/svadm hardlink path=usr/sbin/svboot target=../bin/svboot diff --git a/usr/src/pkg/manifests/driver-usb.mf b/usr/src/pkg/manifests/driver-usb.mf index d45a477a9c..d825a0373f 100644 --- a/usr/src/pkg/manifests/driver-usb.mf +++ b/usr/src/pkg/manifests/driver-usb.mf @@ -51,10 +51,8 @@ dir path=lib dir path=lib/svc dir path=lib/svc/method dir path=sbin group=sys -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys driver name=ehci alias=pciclass,0c0320 perms="* 0644 root sys" driver name=hid alias=usbif,class3 perms="* 0600 root sys" driver name=hubd alias=usbif,class9 perms="* 0644 root sys" @@ -137,7 +135,7 @@ $(i386_ONLY)file path=kernel/strmod/usbwcm group=sys mode=0755 \ reboot-needed=true file path=lib/svc/method/svc-wusb mode=0555 file path=sbin/wusbadm mode=0555 -file path=var/svc/manifest/system/wusb.xml group=sys mode=0444 +file path=lib/svc/manifest/system/wusb.xml group=sys mode=0444 legacy pkg=SUNWusb arch=$(ARCH) category=system \ desc="USBA (USB framework) and USB Device Drivers" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/network-bridging.mf b/usr/src/pkg/manifests/network-bridging.mf index 112a28603e..a60480d5b9 100644 --- a/usr/src/pkg/manifests/network-bridging.mf +++ b/usr/src/pkg/manifests/network-bridging.mf @@ -30,18 +30,18 @@ set name=pkg.summary value="IEEE 802 Bridging Support" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib +dir path=lib/svc dir path=usr group=sys dir path=usr/lib dir path=usr/lib/rcm dir path=usr/lib/rcm/modules -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys file path=usr/lib/bridged mode=0555 file path=usr/lib/librstp.so.1 file path=usr/lib/rcm/modules/SUNW_bridge_rcm.so mode=0555 -file path=var/svc/manifest/network/bridge.xml group=sys mode=0444 +file path=lib/svc/manifest/network/bridge.xml group=sys mode=0444 legacy pkg=SUNWbridger arch=$(ARCH) category=system \ desc="Datalink layer bridging support" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/network-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter.mf index 293227570b..0414703bf5 100644 --- a/usr/src/pkg/manifests/network-ipfilter.mf +++ b/usr/src/pkg/manifests/network-ipfilter.mf @@ -53,9 +53,8 @@ dir path=usr/share/ipfilter/examples dir path=var group=sys dir path=var/db group=sys dir path=var/db/ipf group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys driver name=ipf perms="* 0666 root sys" \ policy="read_priv_set=sys_ip_config write_priv_set=sys_ip_config" file path=etc/ipf/ipf.conf group=sys original_name=SUNWipf:etc/ipf/ipf.conf \ @@ -107,7 +106,7 @@ file path=usr/share/ipfilter/examples/nat.eg file path=usr/share/ipfilter/examples/pool.conf file path=usr/share/ipfilter/examples/server file path=usr/share/ipfilter/examples/tcpstate -file path=var/svc/manifest/network/ipfilter.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ipfilter.xml group=sys mode=0444 hardlink path=usr/lib/ipf/ipftest target=../../../usr/lib/isaexec hardlink path=usr/sbin/ipf target=../../usr/lib/isaexec hardlink path=usr/sbin/ipfs target=../../usr/lib/isaexec diff --git a/usr/src/pkg/manifests/network-iscsi-initiator.mf b/usr/src/pkg/manifests/network-iscsi-initiator.mf index 3d53751caf..3bc0a513e7 100644 --- a/usr/src/pkg/manifests/network-iscsi-initiator.mf +++ b/usr/src/pkg/manifests/network-iscsi-initiator.mf @@ -46,14 +46,11 @@ dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/sbin -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/network group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/network/iscsi group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/network/iscsi group=sys opensolaris.zone=global \ variant.opensolaris.zone=global driver name=iscsi class=scsi-self-identify perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/iscsi group=sys opensolaris.zone=global \ @@ -66,7 +63,7 @@ file path=kernel/drv/iscsi.conf group=sys opensolaris.zone=global \ file path=lib/svc/method/iscsi-initiator mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global file path=usr/sbin/iscsiadm mode=0555 -file path=var/svc/manifest/network/iscsi/iscsi-initiator.xml group=sys mode=0444 \ +file path=lib/svc/manifest/network/iscsi/iscsi-initiator.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWiscsir arch=$(ARCH) category=system \ desc="Sun iSCSI Device Driver" \ diff --git a/usr/src/pkg/manifests/network-iscsi-target.mf b/usr/src/pkg/manifests/network-iscsi-target.mf index f00ac288fc..309d64236e 100644 --- a/usr/src/pkg/manifests/network-iscsi-target.mf +++ b/usr/src/pkg/manifests/network-iscsi-target.mf @@ -46,14 +46,11 @@ dir path=usr/include/sys/iscsit dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/sbin -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/network group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/network/iscsi group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/network/iscsi group=sys opensolaris.zone=global \ variant.opensolaris.zone=global driver name=iscsit perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/iscsit group=sys opensolaris.zone=global \ @@ -72,7 +69,7 @@ file path=usr/lib/libiscsit.so.1 file path=usr/lib/llib-liscsit file path=usr/lib/llib-liscsit.ln file path=usr/sbin/itadm mode=0555 -file path=var/svc/manifest/network/iscsi/iscsi-target.xml group=sys mode=0444 \ +file path=lib/svc/manifest/network/iscsi/iscsi-target.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWiscsitr arch=$(ARCH) category=system \ desc="Sun iSCSI COMSTAR Port Provider" \ diff --git a/usr/src/pkg/manifests/package-svr4.mf b/usr/src/pkg/manifests/package-svr4.mf index 99862033e9..4aaa034ac1 100644 --- a/usr/src/pkg/manifests/package-svr4.mf +++ b/usr/src/pkg/manifests/package-svr4.mf @@ -31,6 +31,8 @@ set name=info.classification \ value=org.opensolaris.category.2008:System/Packaging set name=variant.arch value=$(ARCH) set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib +dir path=lib/svc dir path=usr group=sys dir path=usr/bin dir path=usr/lib @@ -48,9 +50,8 @@ dir path=var/sadm/pkg group=sys mode=0555 dir path=var/sadm/security group=sys mode=0555 dir path=var/spool dir path=var/spool/pkg mode=1777 -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys file path=usr/bin/pkgadm mode=0555 file path=usr/bin/pkgcond group=sys mode=0555 file path=usr/bin/pkginfo group=sys mode=0555 @@ -78,7 +79,7 @@ file path=usr/sbin/pkgadd group=sys mode=0555 file path=usr/sbin/pkgchk group=sys mode=0555 file path=usr/sbin/pkgrm group=sys mode=0555 file path=var/sadm/install/admin/default group=sys mode=0444 -file path=var/svc/manifest/system/pkgserv.xml group=sys mode=0444 +file path=lib/svc/manifest/system/pkgserv.xml group=sys mode=0444 hardlink path=usr/sadm/install/scripts/i.CONFIG.prsv target=./i.preserve hardlink path=usr/sbin/pkgask target=../../usr/sbin/pkgadd hardlink path=usr/sbin/removef target=../../usr/sbin/installf diff --git a/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf b/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf index 32597faa5a..f23eb2c8d3 100644 --- a/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf +++ b/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf @@ -33,21 +33,22 @@ set name=variant.arch value=$(ARCH) set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/apache +dir path=lib +dir path=lib/svc dir path=usr group=sys dir path=usr/apache dir path=usr/apache/libexec dir path=var group=sys dir path=var/lp group=lp mode=0775 owner=lp dir path=var/lp/ipp-listener -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/application group=sys -dir path=var/svc/manifest/application/print group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/application group=sys +dir path=lib/svc/manifest/application/print group=sys file path=etc/apache/httpd-standalone-ipp.conf \ original_name=SUNWippl:etc/apache/httpd-standalone-ipp.conf preserve=true file path=usr/apache/libexec/mod_ipp.so mode=0555 file path=var/lp/ipp-listener/index.html mode=0444 -file path=var/svc/manifest/application/print/ipp-listener.xml group=sys \ +file path=lib/svc/manifest/application/print/ipp-listener.xml group=sys \ mode=0444 legacy pkg=SUNWipplr arch=$(ARCH) category=system \ desc="Internet Printing Protocol(IPP) Apache configuration for service module" \ diff --git a/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf b/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf index 99dbb6a269..c8a5316ec8 100644 --- a/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf +++ b/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf @@ -49,10 +49,9 @@ dir path=var group=sys dir path=var/lp group=lp mode=0775 owner=lp dir path=var/lp/ppd group=lp dir path=var/lp/ppd/caches group=lp -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/application group=sys -dir path=var/svc/manifest/application/print group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/application group=sys +dir path=lib/svc/manifest/application/print group=sys file path=lib/svc/method/ppd-cache-update mode=0555 file path=usr/lib/lp/bin/getmakes group=lp mode=0555 file path=usr/lib/lp/bin/getmodels group=lp mode=0555 @@ -66,7 +65,7 @@ file path=usr/sadm/admin/printmgr/classes/pmserver.jar group=lp file path=usr/sadm/admin/printmgr/lib/libpmgr.so.1 group=lp file path=usr/sbin/ppdmgr group=lp mode=0555 file path=var/lp/ppd/manufaliases group=lp mode=0444 -file path=var/svc/manifest/application/print/ppd-cache-update.xml group=sys \ +file path=lib/svc/manifest/application/print/ppd-cache-update.xml group=sys \ mode=0444 legacy pkg=SUNWppm arch=$(ARCH) category=system \ desc="Graphical tool for managing printers under Solaris." \ diff --git a/usr/src/pkg/manifests/print-lp.mf b/usr/src/pkg/manifests/print-lp.mf index 6e196fb550..bffbbd7d7c 100644 --- a/usr/src/pkg/manifests/print-lp.mf +++ b/usr/src/pkg/manifests/print-lp.mf @@ -71,10 +71,9 @@ dir path=var/spool/lp/admins group=lp mode=0775 owner=lp dir path=var/spool/lp/requests group=lp mode=0775 owner=lp dir path=var/spool/lp/system group=lp mode=0775 owner=lp dir path=var/spool/print group=lp -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/application group=sys -dir path=var/svc/manifest/application/print group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/application group=sys +dir path=lib/svc/manifest/application/print group=sys file path=etc/lp/fd/catv.fd group=lp file path=etc/lp/fd/download.fd group=lp file path=etc/lp/fd/dpost.fd group=lp @@ -217,8 +216,8 @@ file path=usr/share/lib/terminfo/a/att477+basic2 file path=usr/share/lib/terminfo/a/att583+basic file path=var/spool/cron/crontabs/lp group=root mode=0400 \ original_name=SUNWps:var/spool/cron/crontabs/lp preserve=true -file path=var/svc/manifest/application/print/rfc1179.xml group=sys mode=0444 -file path=var/svc/manifest/application/print/server.xml group=sys mode=0444 +file path=lib/svc/manifest/application/print/rfc1179.xml group=sys mode=0444 +file path=lib/svc/manifest/application/print/server.xml group=sys mode=0444 hardlink path=usr/share/lib/terminfo/4/458 \ target=../../../../../usr/share/lib/terminfo/4/457 hardlink path=usr/share/lib/terminfo/4/477qume \ diff --git a/usr/src/pkg/manifests/service-file-system-nfs.mf b/usr/src/pkg/manifests/service-file-system-nfs.mf index 891d3eba84..34fa9912e9 100644 --- a/usr/src/pkg/manifests/service-file-system-nfs.mf +++ b/usr/src/pkg/manifests/service-file-system-nfs.mf @@ -53,11 +53,9 @@ dir path=usr/lib/nfs group=sys dir path=usr/lib/reparse group=bin dir path=usr/lib/reparse/$(ARCH64) group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/nfs group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/nfs group=sys file path=etc/default/nfslogd group=sys \ original_name=SUNWnfss:etc/default/nfslogd preserve=true file path=etc/init.d/nfs.server group=sys mode=0744 \ @@ -79,8 +77,8 @@ file path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so.1 file path=usr/lib/reparse/libnfs_basic.so.1 file path=usr/sbin/exportfs mode=0555 file path=usr/sbin/nfsref mode=0555 -file path=var/svc/manifest/network/nfs/rquota.xml group=sys mode=0444 -file path=var/svc/manifest/network/nfs/server.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/rquota.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/server.xml group=sys mode=0444 legacy pkg=SUNWnfsskr arch=$(ARCH) category=system \ desc="Network File System (NFS) server kernel support (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-file-system-smb.mf b/usr/src/pkg/manifests/service-file-system-smb.mf index 1b6dd70334..85eff65d80 100644 --- a/usr/src/pkg/manifests/service-file-system-smb.mf +++ b/usr/src/pkg/manifests/service-file-system-smb.mf @@ -63,9 +63,9 @@ dir path=var/smb/cvol/windows group=sys dir path=var/smb/cvol/windows/system32 group=sys dir path=var/smb/cvol/windows/system32/vss group=sys dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/smb group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/smb group=sys driver name=smbsrv perms="* 0640 root sys" file path=kernel/drv/$(ARCH64)/smbsrv group=sys opensolaris.zone=global \ variant.opensolaris.zone=global @@ -108,7 +108,7 @@ file path=usr/sbin/smbadm mode=0555 file path=usr/sbin/smbstat mode=0555 file path=var/smb/smbpasswd group=sys mode=0400 \ original_name=SUNWsmbs:var/smb/smbpasswd preserve=true -file path=var/svc/manifest/network/smb/server.xml group=sys mode=0444 +file path=lib/svc/manifest/network/smb/server.xml group=sys mode=0444 legacy pkg=SUNWsmbskr arch=$(ARCH) category=system \ desc="SMB Server kernel root components" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-hal.mf b/usr/src/pkg/manifests/service-hal.mf index 3f13d78689..a60bfa0c78 100644 --- a/usr/src/pkg/manifests/service-hal.mf +++ b/usr/src/pkg/manifests/service-hal.mf @@ -76,14 +76,11 @@ dir path=usr/share group=sys dir path=usr/share/lib group=sys dir path=usr/share/lib/xml group=sys dir path=usr/share/lib/xml/dtd group=sys -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/network group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global file path=etc/dbus-1/system.d/hal.conf opensolaris.zone=global \ variant.opensolaris.zone=global @@ -183,9 +180,9 @@ file path=usr/sbin/hal-get-property mode=0555 file path=usr/sbin/hal-set-property mode=0555 file path=usr/sbin/lshal mode=0555 file path=usr/share/lib/xml/dtd/fdi.dtd.1 -file path=var/svc/manifest/network/network-discovery.xml group=sys mode=0444 \ +file path=lib/svc/manifest/network/network-discovery.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/system/hal.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/hal.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWhal arch=$(ARCH) category=system \ desc="Hardware Abstraction Layer, HAL (freedesktop.org)" \ diff --git a/usr/src/pkg/manifests/service-key-management-sun-fire-15000.mf b/usr/src/pkg/manifests/service-key-management-sun-fire-15000.mf index 663855f228..b7c3bdd052 100644 --- a/usr/src/pkg/manifests/service-key-management-sun-fire-15000.mf +++ b/usr/src/pkg/manifests/service-key-management-sun-fire-15000.mf @@ -48,14 +48,11 @@ dir path=usr group=sys dir path=usr/platform group=sys dir path=usr/platform/sun4u group=sys dir path=usr/platform/sun4u/lib -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/platform group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/platform group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ variant.opensolaris.zone=global driver name=sckmdrv perms="* 0600 root sys" file path=lib/svc/method/svc-sckmd mode=0555 opensolaris.zone=global \ @@ -65,7 +62,7 @@ file path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/sckmdrv group=sys \ file path=platform/SUNW,Sun-Fire-15000/kernel/drv/sckmdrv.conf group=sys \ opensolaris.zone=global reboot-needed=false variant.opensolaris.zone=global file path=usr/platform/sun4u/lib/sckmd group=sys mode=0755 -file path=var/svc/manifest/platform/sun4u/sckmd.xml group=sys mode=0444 \ +file path=lib/svc/manifest/platform/sun4u/sckmd.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWsckm.u arch=$(ARCH).sun4u category=system \ desc="Key Management Modules for Sun Fire 15000" \ diff --git a/usr/src/pkg/manifests/service-network-dhcp.mf b/usr/src/pkg/manifests/service-network-dhcp.mf index b6b8aaab7c..f0c2953b8e 100644 --- a/usr/src/pkg/manifests/service-network-dhcp.mf +++ b/usr/src/pkg/manifests/service-network-dhcp.mf @@ -34,6 +34,8 @@ set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/inet group=sys dir path=etc/init.d group=sys +dir path=lib +dir path=lib/svc dir path=usr group=sys dir path=usr/include dir path=usr/lib @@ -43,10 +45,8 @@ dir path=usr/lib/inet/dhcp/nsu dir path=usr/lib/inet/dhcp/svc dir path=usr/lib/inet/dhcp/svcadm dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys file path=etc/init.d/dhcp group=sys mode=0744 file path=usr/include/dhcp_svc_public.h file path=usr/lib/inet/dhcp/nsu/rfc2136.so.1 @@ -64,7 +64,7 @@ file path=usr/lib/libdhcpsvc.so.1 file path=usr/sbin/dhcpconfig mode=0555 file path=usr/sbin/dhtadm mode=0555 file path=usr/sbin/pntadm mode=0555 -file path=var/svc/manifest/network/dhcp-server.xml group=sys mode=0444 +file path=lib/svc/manifest/network/dhcp-server.xml group=sys mode=0444 legacy pkg=SUNWdhcsr arch=$(ARCH) category=system \ desc="Root filesystem portion of the SunOS BOOTP/DHCP service, which uses the BOOT Protocol and/or Dynamic Host Configuration Protocol to provide network configuration parameters to BOOTP/DHCP clients. Administration utilities for the service are included." \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-dns-mdns.mf b/usr/src/pkg/manifests/service-network-dns-mdns.mf index 5ebeb60920..fa289ac4f2 100644 --- a/usr/src/pkg/manifests/service-network-dns-mdns.mf +++ b/usr/src/pkg/manifests/service-network-dns-mdns.mf @@ -31,6 +31,8 @@ set name=pkg.summary value="Multicast DNS and Service Discovery" set name=info.classification value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib +dir path=lib/svc dir path=usr group=sys dir path=usr/bin dir path=usr/include @@ -48,11 +50,9 @@ dir path=usr/share/lib/java/javadoc/dnssd/api/com/apple group=other dir path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd group=other dir path=usr/share/lib/java/javadoc/dnssd/api/resources group=other dir path=usr/share/lib/java/javadoc/dnssd/examples group=other -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/dns group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/dns group=sys file path=usr/bin/dns-sd mode=0555 file path=usr/include/dns_sd.h file path=usr/lib/$(ARCH64)/libdns_sd.so.1 @@ -126,7 +126,7 @@ file path=usr/share/lib/java/javadoc/dnssd/api/serialized-form.html group=other file path=usr/share/lib/java/javadoc/dnssd/api/stylesheet.css group=other file path=usr/share/lib/java/javadoc/dnssd/examples/BrowserApp.jar group=sys file path=usr/share/lib/java/javadoc/dnssd/examples/SimpleChat.jar group=sys -file path=var/svc/manifest/network/dns/multicast.xml group=sys mode=0444 +file path=lib/svc/manifest/network/dns/multicast.xml group=sys mode=0444 legacy pkg=SUNWdsdr arch=$(ARCH) category=system \ desc="Root components for Multicast DNS daemon and service discovery support" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-ftp.mf b/usr/src/pkg/manifests/service-network-ftp.mf index 81901a0409..22b3635239 100644 --- a/usr/src/pkg/manifests/service-network-ftp.mf +++ b/usr/src/pkg/manifests/service-network-ftp.mf @@ -37,10 +37,8 @@ dir path=lib/svc dir path=lib/svc/method dir path=usr group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys file path=etc/ftpd/ftpaccess group=sys original_name=SUNWftp:etc/ftpd/ftpaccess \ preserve=true file path=etc/ftpd/ftpconversions group=sys \ @@ -59,7 +57,7 @@ file path=usr/sbin/ftprestart mode=0555 file path=usr/sbin/ftpshut mode=0555 file path=usr/sbin/in.ftpd mode=0555 file path=usr/sbin/privatepw mode=0555 -file path=var/svc/manifest/network/ftp.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ftp.xml group=sys mode=0444 hardlink path=usr/sbin/ftpwho target=../../usr/sbin/ftpcount legacy pkg=SUNWftpr arch=$(ARCH) category=system \ desc="FTP Server Configuration Files" \ diff --git a/usr/src/pkg/manifests/service-network-legacy.mf b/usr/src/pkg/manifests/service-network-legacy.mf index e8732b4076..3d2bade767 100644 --- a/usr/src/pkg/manifests/service-network-legacy.mf +++ b/usr/src/pkg/manifests/service-network-legacy.mf @@ -32,23 +32,23 @@ set name=pkg.summary \ set name=info.classification value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib +dir path=lib/svc dir path=usr group=sys dir path=usr/lib dir path=usr/lib/inet -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys file path=usr/lib/inet/in.chargend mode=0555 file path=usr/lib/inet/in.daytimed mode=0555 file path=usr/lib/inet/in.discardd mode=0555 file path=usr/lib/inet/in.echod mode=0555 file path=usr/lib/inet/in.timed mode=0555 -file path=var/svc/manifest/network/chargen.xml group=sys mode=0444 -file path=var/svc/manifest/network/daytime.xml group=sys mode=0444 -file path=var/svc/manifest/network/discard.xml group=sys mode=0444 -file path=var/svc/manifest/network/echo.xml group=sys mode=0444 -file path=var/svc/manifest/network/time.xml group=sys mode=0444 +file path=lib/svc/manifest/network/chargen.xml group=sys mode=0444 +file path=lib/svc/manifest/network/daytime.xml group=sys mode=0444 +file path=lib/svc/manifest/network/discard.xml group=sys mode=0444 +file path=lib/svc/manifest/network/echo.xml group=sys mode=0444 +file path=lib/svc/manifest/network/time.xml group=sys mode=0444 legacy pkg=SUNWcnsr arch=$(ARCH) category=system \ desc="Common Network Services (Root): time, daytime, echo, discard, chargen" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf b/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf index 3ec1029e1b..e37eaf48eb 100644 --- a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf +++ b/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf @@ -32,6 +32,8 @@ set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib +dir path=lib/svc dir path=usr group=sys dir path=usr/include dir path=usr/lib @@ -39,11 +41,9 @@ dir path=usr/lib/$(ARCH64) dir path=usr/lib/inet dir path=usr/lib/inet/ilb dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/loadbalancer group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/loadbalancer group=sys file path=usr/include/libilb.h file path=usr/lib/$(ARCH64)/libilb.so.1 file path=usr/lib/$(ARCH64)/llib-lilb.ln @@ -53,7 +53,7 @@ file path=usr/lib/libilb.so.1 file path=usr/lib/llib-lilb file path=usr/lib/llib-lilb.ln file path=usr/sbin/ilbadm mode=0555 -file path=var/svc/manifest/network/loadbalancer/ilbd.xml group=sys mode=0444 +file path=lib/svc/manifest/network/loadbalancer/ilbd.xml group=sys mode=0444 legacy pkg=SUNWilb arch=$(ARCH) category=system \ desc="Integrated IP layer 3/4 load balancer for Solaris (usr)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-network-servers.mf b/usr/src/pkg/manifests/service-network-network-servers.mf index 3cb065008b..3fbff608fb 100644 --- a/usr/src/pkg/manifests/service-network-network-servers.mf +++ b/usr/src/pkg/manifests/service-network-network-servers.mf @@ -31,6 +31,8 @@ set name=pkg.summary value="Remote Network Server Commands" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib +dir path=lib/svc dir path=etc group=sys dir path=usr group=sys dir path=usr/bin @@ -41,11 +43,9 @@ dir path=usr/lib/netsvc/rusers group=sys dir path=usr/lib/netsvc/rwall group=sys dir path=usr/lib/netsvc/spray group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/rpc group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/rpc group=sys file path=usr/bin/finger mode=0555 file path=usr/bin/rwho mode=0555 file path=usr/bin/talk mode=0555 @@ -60,16 +60,16 @@ file path=usr/sbin/in.rlogind mode=0555 file path=usr/sbin/in.rshd mode=0555 file path=usr/sbin/in.rwhod mode=0555 file path=usr/sbin/in.talkd mode=0555 -file path=var/svc/manifest/network/comsat.xml group=sys mode=0444 -file path=var/svc/manifest/network/finger.xml group=sys mode=0444 -file path=var/svc/manifest/network/login.xml group=sys mode=0444 -file path=var/svc/manifest/network/rexec.xml group=sys mode=0444 -file path=var/svc/manifest/network/rpc/rstat.xml group=sys mode=0444 -file path=var/svc/manifest/network/rpc/rusers.xml group=sys mode=0444 -file path=var/svc/manifest/network/rpc/spray.xml group=sys mode=0444 -file path=var/svc/manifest/network/rpc/wall.xml group=sys mode=0444 -file path=var/svc/manifest/network/shell.xml group=sys mode=0444 -file path=var/svc/manifest/network/talk.xml group=sys mode=0444 +file path=lib/svc/manifest/network/comsat.xml group=sys mode=0444 +file path=lib/svc/manifest/network/finger.xml group=sys mode=0444 +file path=lib/svc/manifest/network/login.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rexec.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/rstat.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/rusers.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/spray.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/wall.xml group=sys mode=0444 +file path=lib/svc/manifest/network/shell.xml group=sys mode=0444 +file path=lib/svc/manifest/network/talk.xml group=sys mode=0444 legacy pkg=SUNWrcmdr arch=$(ARCH) category=system \ desc="Remote Network Server Commands (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-nis.mf b/usr/src/pkg/manifests/service-network-nis.mf index afc7519864..571a70cc69 100644 --- a/usr/src/pkg/manifests/service-network-nis.mf +++ b/usr/src/pkg/manifests/service-network-nis.mf @@ -39,10 +39,11 @@ dir path=usr/lib/netsvc group=sys dir path=usr/lib/netsvc/yp dir path=usr/sbin dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/nis group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/nis group=sys dir path=var/yp dir path=var/yp/binding file path=etc/default/yppasswdd group=sys \ @@ -65,10 +66,10 @@ file path=usr/lib/netsvc/yp/ypxfr_2perday mode=0555 file path=usr/lib/netsvc/yp/ypxfrd mode=0555 file path=usr/sbin/mknetid mode=0555 file path=usr/sbin/revnetgroup mode=0555 -file path=var/svc/manifest/network/nis/passwd.xml group=sys mode=0444 -file path=var/svc/manifest/network/nis/server.xml group=sys mode=0444 -file path=var/svc/manifest/network/nis/update.xml group=sys mode=0444 -file path=var/svc/manifest/network/nis/xfr.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nis/passwd.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nis/server.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nis/update.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nis/xfr.xml group=sys mode=0444 file path=var/yp/Makefile mode=0555 original_name=SUNWyp:var/yp/Makefile \ preserve=renamenew file path=var/yp/updaters mode=0500 diff --git a/usr/src/pkg/manifests/service-network-slp.mf b/usr/src/pkg/manifests/service-network-slp.mf index 30e9cd978f..7717f6c69c 100644 --- a/usr/src/pkg/manifests/service-network-slp.mf +++ b/usr/src/pkg/manifests/service-network-slp.mf @@ -36,6 +36,7 @@ dir path=etc/inet group=sys dir path=etc/init.d group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/include @@ -45,10 +46,7 @@ dir path=usr/lib/inet dir path=usr/share group=sys dir path=usr/share/lib group=sys dir path=usr/share/lib/slp -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib/svc/manifest/network group=sys file path=etc/inet/slp.conf.example group=sys file path=etc/init.d/slpd group=sys mode=0744 file path=lib/svc/method/slp mode=0555 @@ -61,7 +59,7 @@ file path=usr/lib/llib-lslp file path=usr/lib/llib-lslp.ln file path=usr/share/lib/slp/slp.jar group=sys file path=usr/share/lib/slp/slpd.jar group=sys mode=0600 -file path=var/svc/manifest/network/slp.xml group=sys mode=0444 +file path=lib/svc/manifest/network/slp.xml group=sys mode=0444 legacy pkg=SUNWslpr arch=$(ARCH) category=system \ desc="Root filesystem portion of the Service Location Protocol (SLP) framework. Includes the SLP configuration file and start scripts for the SLP daemon." \ hotline="Please contact your local service provider" name="SLP, (Root)" \ diff --git a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf index 22420fb07b..d54de7511f 100644 --- a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf +++ b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf @@ -44,6 +44,7 @@ dir path=etc/mail/cf/ostype group=mail dir path=etc/mail/cf/sh group=mail dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys dir path=lib/svc/method dir path=lib/svc/share dir path=usr group=sys @@ -62,9 +63,7 @@ dir path=var/adm/sm.bin group=sys dir path=var/spool dir path=var/spool/clientmqueue group=smmsp mode=0770 owner=smmsp dir path=var/spool/mqueue mode=0750 -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib/svc/manifest/network group=sys file path=etc/init.d/sendmail group=sys mode=0744 \ original_name=SUNWsndm:etc/init.d/sendmail preserve=true file path=etc/mail/aliases original_name=SUNWsndm:etc/mail/aliases preserve=true @@ -181,8 +180,8 @@ file path=usr/sbin/check-permissions group=mail mode=0555 file path=usr/sbin/editmap mode=0555 file path=usr/sbin/etrn mode=0555 file path=usr/sbin/makemap mode=0555 -file path=var/svc/manifest/network/sendmail-client.xml group=sys mode=0444 -file path=var/svc/manifest/network/smtp-sendmail.xml group=sys mode=0444 +file path=lib/svc/manifest/network/sendmail-client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/smtp-sendmail.xml group=sys mode=0444 legacy pkg=SUNWsndmr arch=$(ARCH) category=system \ desc="Sendmail Configuration Files" \ hotline="Please contact your local service provider" name="Sendmail (root)" \ diff --git a/usr/src/pkg/manifests/service-network-ssh.mf b/usr/src/pkg/manifests/service-network-ssh.mf index 0995796041..56703e86f7 100644 --- a/usr/src/pkg/manifests/service-network-ssh.mf +++ b/usr/src/pkg/manifests/service-network-ssh.mf @@ -34,20 +34,18 @@ dir path=etc group=sys dir path=etc/ssh group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib dir path=usr/lib/ssh -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib/svc/manifest/network group=sys file path=etc/ssh/sshd_config group=sys \ original_name=SUNWsshd:etc/ssh/sshd_config preserve=true file path=lib/svc/method/sshd mode=0555 file path=usr/lib/ssh/sftp-server mode=0555 file path=usr/lib/ssh/sshd mode=0555 -file path=var/svc/manifest/network/ssh.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ssh.xml group=sys mode=0444 legacy pkg=SUNWsshdr arch=$(ARCH) category=system \ desc="Secure Shell protocol Server" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-telnet.mf b/usr/src/pkg/manifests/service-network-telnet.mf index eb869b3ee3..1944cc94a0 100644 --- a/usr/src/pkg/manifests/service-network-telnet.mf +++ b/usr/src/pkg/manifests/service-network-telnet.mf @@ -34,14 +34,14 @@ dir path=etc group=sys dir path=etc/default group=sys dir path=usr group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys file path=etc/default/telnetd group=sys \ original_name=SUNWtnetd:etc/default/telnetd preserve=true file path=usr/sbin/in.telnetd mode=0555 -file path=var/svc/manifest/network/telnet.xml group=sys mode=0444 +file path=lib/svc/manifest/network/telnet.xml group=sys mode=0444 legacy pkg=SUNWtnetd arch=$(ARCH) category=system \ desc="Telnet Server Daemon (Usr)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-uucp.mf b/usr/src/pkg/manifests/service-network-uucp.mf index 62195d40dd..9f60bb20ca 100644 --- a/usr/src/pkg/manifests/service-network-uucp.mf +++ b/usr/src/pkg/manifests/service-network-uucp.mf @@ -46,9 +46,10 @@ dir path=var/spool/uucp/.Corrupt group=uucp owner=uucp dir path=var/spool/uucp/.Workspace group=uucp owner=uucp dir path=var/spool/uucp/.Xqtdir group=uucp owner=uucp dir path=var/spool/uucppublic group=uucp mode=1777 owner=uucp -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=var/uucp group=uucp owner=uucp dir path=var/uucp/.Admin group=uucp owner=uucp dir path=var/uucp/.Log group=uucp owner=uucp @@ -107,7 +108,7 @@ file path=usr/lib/uucp/uudemon.poll group=uucp mode=0555 file path=usr/lib/uucp/uusched group=uucp mode=4511 owner=uucp file path=usr/lib/uucp/uuxqt group=uucp mode=4511 owner=uucp file path=usr/sbin/in.uucpd group=uucp mode=0555 -file path=var/svc/manifest/network/uucp.xml group=sys mode=0444 +file path=lib/svc/manifest/network/uucp.xml group=sys mode=0444 hardlink path=etc/rc2.d/S70uucp target=../../etc/init.d/uucp legacy pkg=SUNWbnur arch=$(ARCH) category=system \ desc="configuration and start-up files for UUCP utilities" \ diff --git a/usr/src/pkg/manifests/service-network-wpa.mf b/usr/src/pkg/manifests/service-network-wpa.mf index c7ac8e722e..7fe1edfd23 100644 --- a/usr/src/pkg/manifests/service-network-wpa.mf +++ b/usr/src/pkg/manifests/service-network-wpa.mf @@ -34,12 +34,12 @@ set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/inet -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys file path=usr/lib/inet/wpad mode=0555 -file path=var/svc/manifest/network/wpa.xml group=sys mode=0444 +file path=lib/svc/manifest/network/wpa.xml group=sys mode=0444 legacy pkg=SUNWwpar arch=$(ARCH) category=system \ desc="The service implements the IEEE802.11i (WPA/WPA2) specification." \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-picl.mf b/usr/src/pkg/manifests/service-picl.mf index b004b11971..c6fe729233 100644 --- a/usr/src/pkg/manifests/service-picl.mf +++ b/usr/src/pkg/manifests/service-picl.mf @@ -131,12 +131,11 @@ $(sparc_ONLY)dir path=usr/platform/sun4v/lib $(sparc_ONLY)dir path=usr/platform/sun4v/lib/picl group=sys $(sparc_ONLY)dir path=usr/platform/sun4v/lib/picl/plugins group=sys dir path=usr/sbin -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global file path=usr/lib/$(ARCH64)/libpicl.so.1 file path=usr/lib/$(ARCH64)/llib-lpicl.ln @@ -616,7 +615,7 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libpriplugin.so.1 \ $(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libsnmpplugin.so.1 \ group=sys file path=usr/sbin/prtpicl mode=0755 -file path=var/svc/manifest/system/picl.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/picl.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWpiclr arch=$(ARCH) category=system \ desc="PICL Framework init scripts" \ diff --git a/usr/src/pkg/manifests/service-resource-cap.mf b/usr/src/pkg/manifests/service-resource-cap.mf index d615d9854e..06c2512625 100644 --- a/usr/src/pkg/manifests/service-resource-cap.mf +++ b/usr/src/pkg/manifests/service-resource-cap.mf @@ -37,15 +37,15 @@ dir path=usr/lib/rcap dir path=usr/lib/rcap/$(ARCH32) dir path=usr/lib/rcap/$(ARCH64) dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys file path=usr/bin/rcapstat mode=0555 file path=usr/lib/rcap/$(ARCH32)/rcapd mode=0555 file path=usr/lib/rcap/$(ARCH64)/rcapd mode=0555 file path=usr/sbin/rcapadm mode=0555 -file path=var/svc/manifest/system/rcap.xml group=sys mode=0444 +file path=lib/svc/manifest/system/rcap.xml group=sys mode=0444 hardlink path=usr/lib/rcap/rcapd target=../isaexec legacy pkg=SUNWrcapr arch=$(ARCH) category=system \ desc="Solaris Resource Capping Daemon (Root)" \ diff --git a/usr/src/pkg/manifests/service-resource-pools.mf b/usr/src/pkg/manifests/service-resource-pools.mf index 2adb2d6fe5..407187fc41 100644 --- a/usr/src/pkg/manifests/service-resource-pools.mf +++ b/usr/src/pkg/manifests/service-resource-pools.mf @@ -53,11 +53,9 @@ dir path=var/adm/pool group=sys opensolaris.zone=global \ variant.opensolaris.zone=global dir path=var/log/pool group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global driver name=pool perms="pool 0666 root sys" perms="poolctl 0666 root sys" file path=lib/svc/method/svc-poold mode=0555 opensolaris.zone=global \ @@ -79,9 +77,9 @@ file path=usr/sbin/pooladm mode=0555 file path=usr/sbin/poolbind mode=0555 file path=usr/sbin/poolcfg mode=0555 file path=usr/share/lib/xml/dtd/rm_pool.dtd.1 -file path=var/svc/manifest/system/poold.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/poold.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/system/pools.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/pools.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWpool arch=$(ARCH) category=system \ desc="core software for resource pools" \ diff --git a/usr/src/pkg/manifests/service-security-gss.mf b/usr/src/pkg/manifests/service-security-gss.mf index 109b878e58..1b06f514cc 100644 --- a/usr/src/pkg/manifests/service-security-gss.mf +++ b/usr/src/pkg/manifests/service-security-gss.mf @@ -33,17 +33,17 @@ set name=variant.arch value=$(ARCH) set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/gss group=sys -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/rpc group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/rpc group=sys file path=etc/gss/gsscred.conf group=sys \ original_name=SUNWgssc:etc/gss/gsscred.conf preserve=true file path=etc/gss/mech group=sys original_name=SUNWgssc:etc/gss/mech \ preserve=true file path=etc/gss/qop group=sys original_name=SUNWgssc:etc/gss/qop preserve=true -file path=var/svc/manifest/network/rpc/gss.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/gss.xml group=sys mode=0444 legacy pkg=SUNWgssc arch=$(ARCH) category=system \ desc="Generic Security Service Application Program Interface, Version 2 - config" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-security-kerberos-5.mf b/usr/src/pkg/manifests/service-security-kerberos-5.mf index 4497b268eb..f898cb9219 100644 --- a/usr/src/pkg/manifests/service-security-kerberos-5.mf +++ b/usr/src/pkg/manifests/service-security-kerberos-5.mf @@ -48,10 +48,11 @@ dir path=var group=sys dir path=var/krb5 group=sys dir path=var/krb5/rcache group=sys mode=1777 dir path=var/krb5/rcache/root group=sys mode=0700 -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/security group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/security group=sys file path=etc/krb5/krb5.conf group=sys original_name=SUNWkrb:etc/krb5/krb5.conf \ preserve=true file path=etc/krb5/warn.conf group=sys original_name=SUNWkrb:etc/krb5/warn.conf \ @@ -75,9 +76,9 @@ file path=usr/lib/security/$(ARCH64)/pam_krb5.so.1 file path=usr/lib/security/$(ARCH64)/pam_krb5_migrate.so.1 file path=usr/lib/security/pam_krb5.so.1 file path=usr/lib/security/pam_krb5_migrate.so.1 -file path=var/svc/manifest/network/security/kadmin.xml group=sys mode=0444 -file path=var/svc/manifest/network/security/krb5kdc.xml group=sys mode=0444 -file path=var/svc/manifest/network/security/ktkt_warn.xml group=sys mode=0444 +file path=lib/svc/manifest/network/security/kadmin.xml group=sys mode=0444 +file path=lib/svc/manifest/network/security/krb5kdc.xml group=sys mode=0444 +file path=lib/svc/manifest/network/security/ktkt_warn.xml group=sys mode=0444 legacy pkg=SUNWkrbr arch=$(ARCH) category=system \ desc="Kerberos version 5 support (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-storage-avs-cache-management.mf b/usr/src/pkg/manifests/service-storage-avs-cache-management.mf index 5f3c9886f4..449fa397fd 100644 --- a/usr/src/pkg/manifests/service-storage-avs-cache-management.mf +++ b/usr/src/pkg/manifests/service-storage-avs-cache-management.mf @@ -63,10 +63,8 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys driver name=ncall devlink=type=ddi_pseudo;name=ncall\t\D perms="* 0666 root sys" \ privs=sys_config privs=sys_devices driver name=nsctl devlink=type=ddi_pseudo;name=nsctl\t\D perms="* 0666 root sys" \ @@ -112,7 +110,7 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/nsctl.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/sdbc.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/nsctl.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/sdbc.so group=sys mode=0555 -file path=var/svc/manifest/system/nws_scm.xml group=sys mode=0444 +file path=lib/svc/manifest/system/nws_scm.xml group=sys mode=0444 hardlink path=lib/svc/method/svc-scm target=../../../etc/init.d/scm hardlink path=usr/cluster/sbin/dscfg_reconfigure \ target=../../bin/dscfg_reconfigure.cluster diff --git a/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf b/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf index 383ad3005b..0c9f2ff1a5 100644 --- a/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf +++ b/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf @@ -38,20 +38,17 @@ dir path=usr group=sys dir path=usr/lib dir path=usr/lib/cfgadm dir path=usr/lib/cfgadm/$(ARCH64) -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/system/device group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system/device group=sys opensolaris.zone=global \ variant.opensolaris.zone=global file path=lib/svc/method/fc-fabric mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global file path=usr/lib/cfgadm/$(ARCH64)/fp.so.1 file path=usr/lib/cfgadm/fp.so.1 -file path=var/svc/manifest/system/device/devices-fc-fabric.xml group=sys \ +file path=lib/svc/manifest/system/device/devices-fc-fabric.xml group=sys \ mode=0444 opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWcfpl arch=$(ARCH) category=system \ desc="Provides the fp plug-in library of libcfgadm." \ diff --git a/usr/src/pkg/manifests/service-storage-isns.mf b/usr/src/pkg/manifests/service-storage-isns.mf index 08e285bb84..6384d766be 100644 --- a/usr/src/pkg/manifests/service-storage-isns.mf +++ b/usr/src/pkg/manifests/service-storage-isns.mf @@ -33,13 +33,13 @@ set name=variant.arch value=$(ARCH) set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys file path=usr/sbin/isns mode=0555 file path=usr/sbin/isnsadm mode=0555 -file path=var/svc/manifest/network/isns_server.xml group=sys mode=0444 +file path=lib/svc/manifest/network/isns_server.xml group=sys mode=0444 legacy pkg=SUNWisns arch=$(ARCH) category=system \ desc="Solaris internet Storage Name Service(iSNS) Server" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-storage-media-volume-manager.mf b/usr/src/pkg/manifests/service-storage-media-volume-manager.mf index a4852cd3d2..4a888ed722 100644 --- a/usr/src/pkg/manifests/service-storage-media-volume-manager.mf +++ b/usr/src/pkg/manifests/service-storage-media-volume-manager.mf @@ -37,14 +37,11 @@ dir path=usr group=sys dir path=usr/bin dir path=usr/lib dir path=usr/sbin -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/system/filesystem group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system/filesystem group=sys opensolaris.zone=global \ variant.opensolaris.zone=global file path=lib/svc/method/svc-rmvolmgr mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global @@ -53,7 +50,7 @@ file path=usr/bin/rmmount mode=0555 file path=usr/bin/volcheck mode=0555 file path=usr/bin/volrmmount mode=0555 file path=usr/lib/rmvolmgr mode=0555 -file path=var/svc/manifest/system/filesystem/rmvolmgr.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/filesystem/rmvolmgr.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWrmvolmgr arch=$(ARCH) category=system \ desc="Non-graphical removable volume manager" \ diff --git a/usr/src/pkg/manifests/service-storage-ndmp.mf b/usr/src/pkg/manifests/service-storage-ndmp.mf index 420dab97e6..4eae1c646d 100644 --- a/usr/src/pkg/manifests/service-storage-ndmp.mf +++ b/usr/src/pkg/manifests/service-storage-ndmp.mf @@ -46,10 +46,8 @@ dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/lib/ndmp dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys file path=lib/svc/method/svc-ndmp mode=0555 file path=usr/include/libndmp.h file path=usr/lib/$(ARCH64)/libndmp.so.1 @@ -60,7 +58,7 @@ file path=usr/lib/llib-lndmp.ln file path=usr/lib/ndmp/ndmpd mode=0555 file path=usr/sbin/ndmpadm mode=0555 file path=usr/sbin/ndmpstat mode=0555 -file path=var/svc/manifest/system/ndmp.xml group=sys mode=0444 +file path=lib/svc/manifest/system/ndmp.xml group=sys mode=0444 legacy pkg=SUNWndmpr arch=$(ARCH) category=system \ desc="Network Data Management Protocol Service (root components)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-storage-removable-media.mf b/usr/src/pkg/manifests/service-storage-removable-media.mf index 6ede2d3268..f11458ec83 100644 --- a/usr/src/pkg/manifests/service-storage-removable-media.mf +++ b/usr/src/pkg/manifests/service-storage-removable-media.mf @@ -36,11 +36,11 @@ dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/lib/smedia dir path=usr/lib/smedia/$(ARCH64) -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/rpc group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/rpc group=sys file path=usr/lib/$(ARCH64)/libsmedia.so.1 file path=usr/lib/$(ARCH64)/llib-lsmedia.ln file path=usr/lib/libsmedia.so.1 @@ -53,7 +53,7 @@ file path=usr/lib/smedia/rpc.smserverd mode=0555 file path=usr/lib/smedia/sm_fd.so.1 mode=0555 file path=usr/lib/smedia/sm_pcata.so.1 mode=0555 file path=usr/lib/smedia/sm_scsi.so.1 mode=0555 -file path=var/svc/manifest/network/rpc/smserver.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/smserver.xml group=sys mode=0444 legacy pkg=SUNWsmedia arch=$(ARCH) category=system \ desc="Storage media management library" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-storage-virus-scan.mf b/usr/src/pkg/manifests/service-storage-virus-scan.mf index 4b04aff7c4..1210c5e499 100644 --- a/usr/src/pkg/manifests/service-storage-virus-scan.mf +++ b/usr/src/pkg/manifests/service-storage-virus-scan.mf @@ -42,11 +42,11 @@ dir path=usr/lib/devfsadm group=sys dir path=usr/lib/devfsadm/linkmod group=sys dir path=usr/lib/vscan dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys -dir path=var/svc/manifest/system/filesystem group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/manifest/system/filesystem group=sys driver name=vscan perms="* 0640 root sys" file path=kernel/drv/$(ARCH64)/vscan group=sys opensolaris.zone=global \ variant.opensolaris.zone=global @@ -58,7 +58,7 @@ file path=usr/lib/devfsadm/linkmod/SUNW_vscan_link.so group=sys file path=usr/lib/vscan/libvscan.so.1 file path=usr/lib/vscan/vscand mode=0555 file path=usr/sbin/vscanadm mode=0555 -file path=var/svc/manifest/system/filesystem/vscan.xml group=sys mode=0444 +file path=lib/svc/manifest/system/filesystem/vscan.xml group=sys mode=0444 legacy pkg=SUNWvscankr arch=$(ARCH) category=system \ desc="Virus Scan Service Kernel Root Components" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf b/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf index 8fcec306ce..67e7144cc1 100644 --- a/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf +++ b/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf @@ -62,10 +62,8 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys driver name=ii devlink=type=ddi_pseudo;name=ii\t\D perms="* 0666 root sys" \ privs=sys_config privs=sys_devices file path=etc/init.d/ii mode=0744 @@ -83,7 +81,7 @@ file path=usr/kernel/drv/ii.conf group=sys \ original_name=SUNWii:usr/kernel/drv/ii.conf preserve=true file path=usr/lib/mdb/kvm/$(ARCH64)/ii.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/ii.so group=sys mode=0555 -file path=var/svc/manifest/system/nws_ii.xml group=sys mode=0444 +file path=lib/svc/manifest/system/nws_ii.xml group=sys mode=0444 hardlink path=lib/svc/method/svc-ii target=../../../etc/init.d/ii legacy pkg=SUNWiir arch=$(ARCH) category=system \ desc="Point-In-Time Copy and snapshot facility" \ diff --git a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf index cb9cd9e926..d7f11d0f2b 100644 --- a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf +++ b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf @@ -63,10 +63,8 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys driver name=rdc devlink=type=ddi_pseudo;name=rdc\t\D perms="* 0666 root sys" \ privs=sys_config privs=sys_devices file path=etc/init.d/rdc mode=0744 @@ -90,8 +88,8 @@ $(i386_ONLY)file path=usr/kernel/drv/rdcstub group=sys file path=usr/lib/librdc.so.1 file path=usr/lib/mdb/kvm/$(ARCH64)/rdc.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/rdc.so group=sys mode=0555 -file path=var/svc/manifest/system/nws_rdc.xml group=sys mode=0444 -file path=var/svc/manifest/system/nws_rdcsyncd.xml group=sys mode=0444 +file path=lib/svc/manifest/system/nws_rdc.xml group=sys mode=0444 +file path=lib/svc/manifest/system/nws_rdcsyncd.xml group=sys mode=0444 hardlink path=lib/svc/method/svc-rdc target=../../../etc/init.d/rdc hardlink path=lib/svc/method/svc-rdcsyncd target=../../../etc/init.d/rdcfinish hardlink path=usr/kernel/misc/$(ARCH64)/rdcsrv target=../../drv/$(ARCH64)/rdcsrv diff --git a/usr/src/pkg/manifests/storage-stmf.mf b/usr/src/pkg/manifests/storage-stmf.mf index ecc0b07946..59740f8b7a 100644 --- a/usr/src/pkg/manifests/storage-stmf.mf +++ b/usr/src/pkg/manifests/storage-stmf.mf @@ -56,12 +56,9 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global driver name=fct perms="* 0666 root sys" driver name=pppt perms="* 0666 root sys" @@ -128,7 +125,7 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/stmf.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/stmf.so group=sys mode=0555 file path=usr/sbin/sbdadm mode=0555 file path=usr/sbin/stmfadm mode=0555 -file path=var/svc/manifest/system/stmf.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/stmf.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWstmf arch=$(ARCH) category=system \ desc="Sun Common Multiprotocol SCSI Target device drivers" \ diff --git a/usr/src/pkg/manifests/storage-svm.mf b/usr/src/pkg/manifests/storage-svm.mf index 7aecc7d827..82568b62c4 100644 --- a/usr/src/pkg/manifests/storage-svm.mf +++ b/usr/src/pkg/manifests/storage-svm.mf @@ -60,16 +60,13 @@ dir path=usr/lib/lvm dir path=usr/sbin dir path=usr/snadm dir path=usr/snadm/lib -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/network group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/network/rpc group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/network/rpc group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global driver name=md policy="admin write_priv_set=sys_config" perms="* 0640 root sys" \ perms="admin 0644 root sys" @@ -175,19 +172,19 @@ file path=usr/sbin/rpc.metad mode=0555 file path=usr/sbin/rpc.metamedd mode=0555 file path=usr/sbin/rpc.metamhd mode=0555 file path=usr/snadm/lib/libsvm.so.1 -file path=var/svc/manifest/network/rpc/mdcomm.xml group=sys mode=0444 \ +file path=lib/svc/manifest/network/rpc/mdcomm.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/network/rpc/meta.xml group=sys mode=0444 \ +file path=lib/svc/manifest/network/rpc/meta.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/network/rpc/metamed.xml group=sys mode=0444 \ +file path=lib/svc/manifest/network/rpc/metamed.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/network/rpc/metamh.xml group=sys mode=0444 \ +file path=lib/svc/manifest/network/rpc/metamh.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/system/mdmonitor.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/mdmonitor.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/system/metainit.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/metainit.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/system/metasync.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/metasync.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWmdr arch=$(ARCH) category=system \ desc="Solaris Volume Manager driver" \ diff --git a/usr/src/pkg/manifests/system-accounting-legacy.mf b/usr/src/pkg/manifests/system-accounting-legacy.mf index e21c1b95d1..17bac3687a 100644 --- a/usr/src/pkg/manifests/system-accounting-legacy.mf +++ b/usr/src/pkg/manifests/system-accounting-legacy.mf @@ -54,9 +54,8 @@ dir path=var/adm/sa group=sys mode=0775 owner=adm dir path=var/spool dir path=var/spool/cron group=sys dir path=var/spool/cron/crontabs group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys file path=etc/acct/holidays original_name=SUNWacc:etc/acct/holidays \ preserve=true file path=etc/init.d/acct group=sys mode=0744 \ @@ -102,7 +101,7 @@ file path=usr/lib/sa/sadc mode=0555 file path=usr/sbin/sar mode=0555 file path=var/spool/cron/crontabs/sys group=sys mode=0600 \ original_name=SUNWacc:var/spool/cron/crontabs/sys preserve=true -file path=var/svc/manifest/system/sar.xml group=sys mode=0444 +file path=lib/svc/manifest/system/sar.xml group=sys mode=0444 legacy pkg=SUNWaccr arch=$(ARCH) category=system \ desc="utilities for accounting and reporting of system activity" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-boot-network.mf b/usr/src/pkg/manifests/system-boot-network.mf index e173b81e25..6fb6a69789 100644 --- a/usr/src/pkg/manifests/system-boot-network.mf +++ b/usr/src/pkg/manifests/system-boot-network.mf @@ -32,15 +32,15 @@ set name=variant.arch value=$(ARCH) set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/rpc group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/rpc group=sys file path=usr/sbin/in.rarpd mode=0555 file path=usr/sbin/rpc.bootparamd mode=0555 -file path=var/svc/manifest/network/rarp.xml group=sys mode=0444 -file path=var/svc/manifest/network/rpc/bootparams.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rarp.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/bootparams.xml group=sys mode=0444 legacy pkg=SUNWbsr arch=$(ARCH) category=system \ desc="Boot Server daemons (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf b/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf index c1c3401777..0d7c33a7dc 100644 --- a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf +++ b/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf @@ -40,14 +40,11 @@ dir path=usr/platform group=sys dir path=usr/platform/SUNW,SPARC-Enterprise group=sys dir path=usr/platform/SUNW,SPARC-Enterprise/lib dir path=usr/platform/SUNW,SPARC-Enterprise/lib/$(ARCH64) -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/platform group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/platform group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ variant.opensolaris.zone=global file path=lib/svc/method/svc-dcs mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global @@ -55,9 +52,9 @@ file path=lib/svc/method/svc-oplhpd mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global file path=usr/lib/dcs mode=0755 file path=usr/platform/SUNW,SPARC-Enterprise/lib/$(ARCH64)/oplhpd mode=0755 -file path=var/svc/manifest/platform/sun4u/dcs.xml group=sys mode=0444 \ +file path=lib/svc/manifest/platform/sun4u/dcs.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/platform/sun4u/oplhpd.xml group=sys mode=0444 \ +file path=lib/svc/manifest/platform/sun4u/oplhpd.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWdcsr arch=$(ARCH) category=system \ desc="Domain Configuration Server, (Root)" \ diff --git a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf index e003735971..58a57a33b3 100644 --- a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf +++ b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf @@ -51,11 +51,9 @@ dir path=usr/platform group=sys dir path=usr/platform/SUNW,SPARC-Enterprise group=sys dir path=usr/platform/SUNW,SPARC-Enterprise/lib dir path=usr/platform/SUNW,SPARC-Enterprise/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/platform group=sys -dir path=var/svc/manifest/platform/sun4u group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/platform group=sys +dir path=lib/svc/manifest/platform/sun4u group=sys driver name=dm2s driver name=oplkmdrv file path=lib/svc/method/svc-dscp mode=0555 @@ -70,7 +68,7 @@ file path=usr/platform/SUNW,SPARC-Enterprise/lib/dscp.ppp.options group=sys \ file path=usr/platform/SUNW,SPARC-Enterprise/lib/libdscp.so.1 file path=usr/platform/SUNW,SPARC-Enterprise/lib/llib-ldscp.ln group=sys file path=usr/platform/SUNW,SPARC-Enterprise/sbin/prtdscp mode=0755 -file path=var/svc/manifest/platform/sun4u/dscp.xml group=sys mode=0444 +file path=lib/svc/manifest/platform/sun4u/dscp.xml group=sys mode=0444 legacy pkg=SUNWdscpr.u arch=$(ARCH).sun4u category=system \ desc="Domain to Service Processor Communications Protocol (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf index 3d34a9ccd5..278dd00910 100644 --- a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf +++ b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf @@ -60,16 +60,15 @@ dir path=usr group=sys dir path=usr/lib dir path=usr/lib/efcode dir path=usr/lib/efcode/$(ARCH64) -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/platform group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/platform group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/platform/sun4v group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/platform/sun4v group=sys opensolaris.zone=global \ variant.opensolaris.zone=global driver name=fcode file path=etc/flash/postdeployment/efcode.cleanup group=sys mode=0744 \ @@ -99,9 +98,9 @@ file path=usr/lib/efcode/$(ARCH64)/lfc_jupiter.so file path=usr/lib/efcode/$(ARCH64)/lfc_upa.so file path=usr/lib/efcode/$(ARCH64)/lfc_upa_pci.so file path=usr/lib/efcode/efcode.sh mode=0555 -file path=var/svc/manifest/platform/sun4u/efdaemon.xml group=sys mode=0444 \ +file path=lib/svc/manifest/platform/sun4u/efdaemon.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/platform/sun4v/efdaemon.xml group=sys mode=0444 \ +file path=lib/svc/manifest/platform/sun4v/efdaemon.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWefc.u arch=$(ARCH).sun4u category=system \ desc="Embedded FCode Interpreter Drivers" \ diff --git a/usr/src/pkg/manifests/system-file-system-autofs.mf b/usr/src/pkg/manifests/system-file-system-autofs.mf index 48973632c2..3a428ade6a 100644 --- a/usr/src/pkg/manifests/system-file-system-autofs.mf +++ b/usr/src/pkg/manifests/system-file-system-autofs.mf @@ -43,11 +43,9 @@ dir path=usr/lib/autofs group=sys dir path=usr/lib/fs group=sys dir path=usr/lib/fs/autofs group=sys dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys -dir path=var/svc/manifest/system/filesystem group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/manifest/system/filesystem group=sys file path=etc/auto_home original_name=SUNWatfs:etc/auto_home preserve=true file path=etc/auto_master original_name=SUNWatfs:etc/auto_master preserve=true file path=etc/default/autofs group=sys original_name=SUNWatfs:etc/default/autofs \ @@ -59,7 +57,7 @@ file path=usr/lib/fs/autofs/dfshares mode=0555 file path=usr/lib/fs/autofs/mount mode=0555 file path=usr/lib/fs/autofs/share mode=0555 file path=usr/lib/fs/autofs/unshare mode=0555 -file path=var/svc/manifest/system/filesystem/autofs.xml group=sys mode=0444 +file path=lib/svc/manifest/system/filesystem/autofs.xml group=sys mode=0444 legacy pkg=SUNWatfsr arch=$(ARCH) category=system \ desc="configuration and start-up files for the AutoFS filesystem" \ hotline="Please contact your local service provider" name="AutoFS, (Root)" \ diff --git a/usr/src/pkg/manifests/system-file-system-nfs.mf b/usr/src/pkg/manifests/system-file-system-nfs.mf index 791d8882c9..fd34ac0ff2 100644 --- a/usr/src/pkg/manifests/system-file-system-nfs.mf +++ b/usr/src/pkg/manifests/system-file-system-nfs.mf @@ -63,10 +63,9 @@ dir path=var group=sys dir path=var/nfs dir path=var/nfs/v4_oldstate group=daemon owner=daemon dir path=var/nfs/v4_state group=daemon owner=daemon -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/nfs group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/nfs group=sys file path=etc/default/nfs group=sys original_name=SUNWnfsc:etc/default/nfs \ preserve=true file path=etc/fs/nfs/mount mode=0555 @@ -104,11 +103,11 @@ file path=usr/lib/nfs/lockd mode=0555 file path=usr/lib/nfs/nfs4cbd mode=0555 file path=usr/lib/nfs/nfsmapid mode=0555 file path=usr/lib/nfs/statd mode=0555 -file path=var/svc/manifest/network/nfs/cbd.xml group=sys mode=0444 -file path=var/svc/manifest/network/nfs/client.xml group=sys mode=0444 -file path=var/svc/manifest/network/nfs/mapid.xml group=sys mode=0444 -file path=var/svc/manifest/network/nfs/nlockmgr.xml group=sys mode=0444 -file path=var/svc/manifest/network/nfs/status.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/cbd.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/mapid.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/nlockmgr.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/status.xml group=sys mode=0444 group groupname=unknown gid=96 hardlink path=kernel/sys/$(ARCH64)/nfs opensolaris.zone=global \ target=../../../kernel/fs/$(ARCH64)/nfs variant.opensolaris.zone=global diff --git a/usr/src/pkg/manifests/system-file-system-smb.mf b/usr/src/pkg/manifests/system-file-system-smb.mf index a7724dd46b..cc6be650f8 100644 --- a/usr/src/pkg/manifests/system-file-system-smb.mf +++ b/usr/src/pkg/manifests/system-file-system-smb.mf @@ -54,11 +54,9 @@ dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/lib/security dir path=usr/lib/security/$(ARCH64) dir path=usr/lib/smbfs -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/smb group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/smb group=sys driver name=nsmb devlink=type=ddi_pseudo;name=nsmb\t\D perms="* 0666 root sys" file path=lib/svc/method/smb-client mode=0555 file path=usr/bin/smbutil mode=0555 @@ -84,7 +82,7 @@ $(i386_ONLY)file path=usr/lib/mdb/kvm/smbfs.so mode=0555 file path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so.1 file path=usr/lib/security/pam_smbfs_login.so.1 file path=usr/lib/smbfs/smbiod mode=0555 -file path=var/svc/manifest/network/smb/client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/smb/client.xml group=sys mode=0444 legacy pkg=SUNWsmbfskr arch=$(ARCH) category=system \ desc="SMB/CIFS File System client support (Kernel)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-floating-point-scrubber.mf b/usr/src/pkg/manifests/system-floating-point-scrubber.mf index 0d8f79793e..4fc7090047 100644 --- a/usr/src/pkg/manifests/system-floating-point-scrubber.mf +++ b/usr/src/pkg/manifests/system-floating-point-scrubber.mf @@ -46,13 +46,13 @@ dir path=usr/lib/fps/sun4u/UltraSPARC-III+ dir path=usr/lib/fps/sun4u/UltraSPARC-IIIi dir path=usr/lib/fps/sun4u/UltraSPARC-IV dir path=usr/lib/fps/sun4u/UltraSPARC-IV+ -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys file path=usr/lib/fps/fpsd mode=0555 file path=usr/lib/fps/sun4u/UltraSPARC-III/fptest mode=0555 -file path=var/svc/manifest/system/fpsd.xml group=sys mode=0444 +file path=lib/svc/manifest/system/fpsd.xml group=sys mode=0444 legacy pkg=SUNWfsr arch=$(ARCH) category=system \ desc="FP Scrubber configuration files (ROOT)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.mf b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.mf index 5e6136805e..d1c6e5de8d 100644 --- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.mf +++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.mf @@ -41,19 +41,16 @@ dir path=usr/platform/SUNW,Sun-Fire-880 group=sys dir path=usr/platform/SUNW,Sun-Fire-880/lib dir path=usr/platform/SUNW,Sun-Fire-V890 group=sys dir path=usr/platform/SUNW,Sun-Fire-V890/lib -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/platform group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/platform group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ variant.opensolaris.zone=global file path=lib/svc/method/sf880dr mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global file path=usr/platform/SUNW,Sun-Fire-880/lib/sf880drd group=sys mode=0755 -file path=var/svc/manifest/platform/sun4u/sf880drd.xml group=sys mode=0444 \ +file path=lib/svc/manifest/platform/sun4u/sf880drd.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWsfdr.u arch=$(ARCH).sun4u category=system \ desc="Sun Fire 880 DR Daemon" \ diff --git a/usr/src/pkg/manifests/system-kernel-power.mf b/usr/src/pkg/manifests/system-kernel-power.mf index 41c2c61dce..b3561a289f 100644 --- a/usr/src/pkg/manifests/system-kernel-power.mf +++ b/usr/src/pkg/manifests/system-kernel-power.mf @@ -45,12 +45,9 @@ dir path=usr/kernel/drv/$(ARCH64) group=sys dir path=usr/lib dir path=usr/lib/power group=sys dir path=usr/sbin -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global driver name=pm perms="* 0666 root sys" file path=etc/default/power group=sys opensolaris.zone=global \ @@ -67,7 +64,7 @@ file path=usr/kernel/drv/pm.conf group=sys file path=usr/lib/power/powerd mode=0555 file path=usr/sbin/pmconfig mode=4555 file path=usr/sbin/sysidpm group=sys mode=0755 -file path=var/svc/manifest/system/power.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/power.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWpmr arch=$(ARCH) category=system \ desc="Power Management config file and rc script" \ diff --git a/usr/src/pkg/manifests/system-kernel.mf b/usr/src/pkg/manifests/system-kernel.mf index 3d0cae742d..a1152c7d29 100644 --- a/usr/src/pkg/manifests/system-kernel.mf +++ b/usr/src/pkg/manifests/system-kernel.mf @@ -77,10 +77,8 @@ dir path=kernel/sys/$(ARCH64) group=sys dir path=lib dir path=lib/svc dir path=lib/svc/method -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys $(i386_ONLY)driver name=acpi_drv perms="* 0666 root sys" driver name=aggr perms="* 0666 root sys" driver name=arp perms="arp 0666 root sys" @@ -854,10 +852,10 @@ $(i386_ONLY)file path=kernel/sys/shmsys group=sys mode=0755 reboot-needed=true file path=lib/svc/method/svc-dumpadm mode=0555 file path=lib/svc/method/svc-intrd mode=0555 file path=lib/svc/method/svc-scheduler mode=0555 -file path=var/svc/manifest/system/dumpadm.xml group=sys mode=0444 -file path=var/svc/manifest/system/fmd.xml group=sys mode=0444 -file path=var/svc/manifest/system/intrd.xml group=sys mode=0444 -file path=var/svc/manifest/system/scheduler.xml group=sys mode=0444 +file path=lib/svc/manifest/system/dumpadm.xml group=sys mode=0444 +file path=lib/svc/manifest/system/fmd.xml group=sys mode=0444 +file path=lib/svc/manifest/system/intrd.xml group=sys mode=0444 +file path=lib/svc/manifest/system/scheduler.xml group=sys mode=0444 hardlink path=kernel/misc/$(ARCH64)/md5 \ target=../../../kernel/crypto/$(ARCH64)/md5 hardlink path=kernel/misc/$(ARCH64)/sha1 \ diff --git a/usr/src/pkg/manifests/system-ldoms.mf b/usr/src/pkg/manifests/system-ldoms.mf index d8473ec137..f600554dcd 100644 --- a/usr/src/pkg/manifests/system-ldoms.mf +++ b/usr/src/pkg/manifests/system-ldoms.mf @@ -53,11 +53,9 @@ dir path=usr/lib/$(ARCH64) dir path=usr/lib/ldoms dir path=usr/lib/rcm dir path=usr/lib/rcm/scripts -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/platform group=sys -dir path=var/svc/manifest/platform/sun4v group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/platform group=sys +dir path=lib/svc/manifest/platform/sun4v group=sys driver name=cnex alias=SUNW,sun4v-channel-devices driver name=drctl driver name=ds_pri @@ -110,9 +108,9 @@ file path=usr/lib/ldoms/vntsd mode=0555 file path=usr/lib/libds.so.1 file path=usr/lib/libpri.so.1 file path=usr/lib/rcm/scripts/SUNW,vdevices.pl mode=0555 -file path=var/svc/manifest/platform/sun4v/drd.xml group=sys mode=0444 -file path=var/svc/manifest/platform/sun4v/ldoms-agents.xml group=sys mode=0444 -file path=var/svc/manifest/platform/sun4v/vntsd.xml group=sys mode=0444 +file path=lib/svc/manifest/platform/sun4v/drd.xml group=sys mode=0444 +file path=lib/svc/manifest/platform/sun4v/ldoms-agents.xml group=sys mode=0444 +file path=lib/svc/manifest/platform/sun4v/vntsd.xml group=sys mode=0444 legacy pkg=SUNWldomr.v arch=$(ARCH).sun4v category=system \ desc="Solaris Logical Domains Configuration Files" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-management-intel-amt.mf b/usr/src/pkg/manifests/system-management-intel-amt.mf index 5a1c370ca4..5d16e2696a 100644 --- a/usr/src/pkg/manifests/system-management-intel-amt.mf +++ b/usr/src/pkg/manifests/system-management-intel-amt.mf @@ -40,10 +40,8 @@ dir path=lib/svc dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys driver name=heci perms="* 0644 root sys" \ alias=pci8086,2974 \ alias=pci8086,2984 \ @@ -57,7 +55,7 @@ file path=kernel/drv/$(ARCH64)/heci group=sys file path=kernel/drv/heci group=sys file path=lib/svc/method/svc-lms mode=0555 file path=usr/lib/lms mode=0555 -file path=var/svc/manifest/network/lms.xml group=sys mode=0444 +file path=lib/svc/manifest/network/lms.xml group=sys mode=0444 legacy pkg=SUNWamt arch=$(ARCH) category=system \ desc="Solaris support for Intel Active Management Technology" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf b/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf index bbb568e083..f24475882a 100644 --- a/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf +++ b/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf @@ -43,10 +43,9 @@ dir path=lib/svc/method dir path=var group=sys dir path=var/snmp group=sys dir path=var/snmp/mib group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/application group=sys -dir path=var/svc/manifest/application/management group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/application group=sys +dir path=lib/svc/manifest/application/management group=sys file path=etc/init.d/init.snmpdx group=sys mode=0744 file path=etc/snmp/conf/enterprises.oid group=sys file path=etc/snmp/conf/mibiisa.reg group=sys \ @@ -64,7 +63,7 @@ file path=etc/snmp/conf/snmpdx.rsrc group=sys \ file path=lib/svc/method/svc-snmpdx mode=0555 file path=var/snmp/mib/snmpdx.mib group=sys file path=var/snmp/mib/sun.mib group=sys -file path=var/svc/manifest/application/management/snmpdx.xml group=sys mode=0444 +file path=lib/svc/manifest/application/management/snmpdx.xml group=sys mode=0444 legacy pkg=SUNWsacom arch=$(ARCH) category=system \ desc="Solstice Enterprise Agents 1.0.3 files for root file system" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-network-console.mf b/usr/src/pkg/manifests/system-network-console.mf index 00aa8b8633..ff65074212 100644 --- a/usr/src/pkg/manifests/system-network-console.mf +++ b/usr/src/pkg/manifests/system-network-console.mf @@ -50,10 +50,8 @@ dir path=platform/SUNW,Ultra-Enterprise-10000/kernel group=sys dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv group=sys dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/$(ARCH64) group=sys dir path=platform/SUNW,Ultra-Enterprise-10000/lib -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys driver name=cvc perms="* 0600 root sys" driver name=cvcredir perms="* 0600 root sys" file path=lib/svc/method/svc-cvcd mode=0555 @@ -75,7 +73,7 @@ file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/cvcredir.conf \ group=sys reboot-needed=false file path=platform/SUNW,Ultra-Enterprise-10000/lib/cvcd group=sys mode=0700 \ reboot-needed=true -file path=var/svc/manifest/system/cvc.xml group=sys mode=0444 +file path=lib/svc/manifest/system/cvc.xml group=sys mode=0444 legacy pkg=SUNWcvc.u arch=$(ARCH).sun4u category=system desc="Network Console" \ hotline="Please contact your local service provider" name="Network Console" \ vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/system-network-nis.mf b/usr/src/pkg/manifests/system-network-nis.mf index 1c0bac7938..17f4bc3df1 100644 --- a/usr/src/pkg/manifests/system-network-nis.mf +++ b/usr/src/pkg/manifests/system-network-nis.mf @@ -43,11 +43,12 @@ dir path=usr/lib/netsvc/yp dir path=usr/sbin dir path=var group=sys dir path=var/ldap group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/nis group=sys -dir path=var/svc/manifest/network/rpc group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/nis group=sys +dir path=lib/svc/manifest/network/rpc group=sys dir path=var/yp dir path=var/yp/binding file path=etc/nsswitch.nis group=sys @@ -75,8 +76,8 @@ file path=usr/sbin/ypalias mode=0555 file path=usr/sbin/ypinit mode=0555 file path=usr/sbin/yppoll mode=0555 file path=usr/sbin/ypset mode=0555 -file path=var/svc/manifest/network/nis/client.xml group=sys mode=0444 -file path=var/svc/manifest/network/rpc/rex.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nis/client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/rex.xml group=sys mode=0444 file path=var/yp/aliases mode=0555 original_name=SUNWnis:var/yp/aliases \ preserve=true file path=var/yp/nicknames original_name=SUNWnis:var/yp/nicknames preserve=true diff --git a/usr/src/pkg/manifests/system-network-routing-vrrp.mf b/usr/src/pkg/manifests/system-network-routing-vrrp.mf index 98129e26c4..2080b17800 100644 --- a/usr/src/pkg/manifests/system-network-routing-vrrp.mf +++ b/usr/src/pkg/manifests/system-network-routing-vrrp.mf @@ -41,17 +41,15 @@ dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/lib/inet dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys file path=etc/inet/vrrp.conf group=sys file path=lib/svc/method/svc-vrrp mode=0555 file path=usr/lib/$(ARCH64)/libvrrpadm.so.1 file path=usr/lib/inet/vrrpd mode=0555 file path=usr/lib/libvrrpadm.so.1 file path=usr/sbin/vrrpadm mode=0555 -file path=var/svc/manifest/network/vrrp.xml group=sys mode=0444 +file path=lib/svc/manifest/network/vrrp.xml group=sys mode=0444 legacy pkg=SUNWvrrpr arch=$(ARCH) category=system \ desc="Solaris VRRP Administration" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-network-routing.mf b/usr/src/pkg/manifests/system-network-routing.mf index e041c25f8a..4b7c62f562 100644 --- a/usr/src/pkg/manifests/system-network-routing.mf +++ b/usr/src/pkg/manifests/system-network-routing.mf @@ -37,11 +37,9 @@ dir path=usr group=sys dir path=usr/lib dir path=usr/lib/inet dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/routing group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/routing group=sys file path=lib/svc/method/svc-ndp mode=0555 file path=lib/svc/method/svc-rdisc mode=0555 file path=lib/svc/method/svc-ripng mode=0555 @@ -51,10 +49,10 @@ file path=usr/lib/inet/in.ripngd mode=0555 file path=usr/sbin/in.rdisc mode=0555 file path=usr/sbin/in.routed mode=0555 file path=usr/sbin/rtquery mode=0555 -file path=var/svc/manifest/network/routing/ndp.xml group=sys mode=0444 -file path=var/svc/manifest/network/routing/rdisc.xml group=sys mode=0444 -file path=var/svc/manifest/network/routing/ripng.xml group=sys mode=0444 -file path=var/svc/manifest/network/routing/route.xml group=sys mode=0444 +file path=lib/svc/manifest/network/routing/ndp.xml group=sys mode=0444 +file path=lib/svc/manifest/network/routing/rdisc.xml group=sys mode=0444 +file path=lib/svc/manifest/network/routing/ripng.xml group=sys mode=0444 +file path=lib/svc/manifest/network/routing/route.xml group=sys mode=0444 legacy pkg=SUNWroute arch=$(ARCH) category=system \ desc="Network Routing daemons/commands (Usr)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-security-kerberos-5.mf b/usr/src/pkg/manifests/system-security-kerberos-5.mf index a936065ad2..b484c42084 100644 --- a/usr/src/pkg/manifests/system-security-kerberos-5.mf +++ b/usr/src/pkg/manifests/system-security-kerberos-5.mf @@ -44,10 +44,11 @@ dir path=usr/share/lib group=sys dir path=usr/share/lib/ldif group=sys dir path=var group=sys dir path=var/krb5 group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/network group=sys -dir path=var/svc/manifest/network/security group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/security group=sys file path=etc/krb5/kadm5.acl group=sys original_name=SUNWkdc:etc/krb5/kadm5.acl \ preserve=true file path=etc/krb5/kdc.conf group=sys original_name=SUNWkdc:etc/krb5/kdc.conf \ @@ -90,7 +91,7 @@ file path=usr/sbin/kdb5_util mode=0555 file path=usr/sbin/kdcmgr mode=0555 file path=usr/sbin/kproplog mode=0555 file path=usr/share/lib/ldif/kerberos.ldif -file path=var/svc/manifest/network/security/krb5_prop.xml group=sys mode=0444 +file path=lib/svc/manifest/network/security/krb5_prop.xml group=sys mode=0444 legacy pkg=SUNWkdcr arch=$(ARCH) category=system desc="Kerberos V5 KDC (root)" \ hotline="Please contact your local service provider" \ name="Kerberos V5 KDC (root)" vendor="Sun Microsystems, Inc." \ diff --git a/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf b/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf index 567ce1f773..8b2ca5303e 100644 --- a/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf +++ b/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf @@ -36,14 +36,11 @@ dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/sbin -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/network group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global file path=lib/svc/method/npivconfig mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global @@ -52,11 +49,11 @@ file path=lib/svc/method/svc-fcoei mode=0555 opensolaris.zone=global \ file path=lib/svc/method/svc-fcoet mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global file path=usr/sbin/fcinfo mode=0555 -file path=var/svc/manifest/network/npiv_config.xml group=sys mode=0444 \ +file path=lib/svc/manifest/network/npiv_config.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/system/fcoe_initiator.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/fcoe_initiator.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/system/fcoe_target.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/fcoe_target.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global hardlink path=usr/sbin/fcadm target=../../usr/sbin/fcinfo legacy pkg=SUNWfcprt arch=$(ARCH) category=system \ diff --git a/usr/src/pkg/manifests/system-storage-mms.mf b/usr/src/pkg/manifests/system-storage-mms.mf index 24a0186fe2..e487d0efcb 100644 --- a/usr/src/pkg/manifests/system-storage-mms.mf +++ b/usr/src/pkg/manifests/system-storage-mms.mf @@ -86,13 +86,11 @@ dir path=var/mms/ssl/ca group=sys opensolaris.zone=global \ variant.opensolaris.zone=global dir path=var/mms/ssl/pub group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/application group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/application group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/application/management group=sys \ +dir path=lib/svc/manifest/application/management group=sys \ opensolaris.zone=global variant.opensolaris.zone=global driver name=dda devlink=type=ddi_pseudo;name=dda\tdda/\N0\M0 driver name=dmd @@ -192,7 +190,7 @@ file path=var/log/mms/mms_logadm.conf group=sys opensolaris.zone=global \ variant.opensolaris.zone=global file path=var/mms/ssl/ca/mms_openssl.cnf group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -file path=var/svc/manifest/application/management/mms.xml group=sys mode=0444 \ +file path=lib/svc/manifest/application/management/mms.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWmmsr arch=$(ARCH) category=system desc="Media Management System" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-trusted-global-zone.mf b/usr/src/pkg/manifests/system-trusted-global-zone.mf index f6943b654a..35e47381c3 100644 --- a/usr/src/pkg/manifests/system-trusted-global-zone.mf +++ b/usr/src/pkg/manifests/system-trusted-global-zone.mf @@ -45,15 +45,13 @@ dir path=etc/zones group=sys opensolaris.zone=global \ dir path=lib opensolaris.zone=global variant.opensolaris.zone=global dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/network group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global +dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global dir path=var/tsol group=sys opensolaris.zone=global \ variant.opensolaris.zone=global dir path=var/tsol/doors group=sys opensolaris.zone=global \ @@ -100,11 +98,11 @@ file path=lib/svc/method/svc-tnctl mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global file path=lib/svc/method/svc-tnd mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global -file path=var/svc/manifest/network/tnctl.xml group=sys mode=0444 \ +file path=lib/svc/manifest/network/tnctl.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/network/tnd.xml group=sys mode=0444 \ +file path=lib/svc/manifest/network/tnd.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/system/labeld.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/labeld.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWtsg arch=$(ARCH) category=system \ desc="Solaris Trusted Extensions, globalzone-only files" \ diff --git a/usr/src/pkg/manifests/system-trusted.mf b/usr/src/pkg/manifests/system-trusted.mf index af1ef9afe6..09969cad15 100644 --- a/usr/src/pkg/manifests/system-trusted.mf +++ b/usr/src/pkg/manifests/system-trusted.mf @@ -56,10 +56,8 @@ dir path=usr/lib/lp/model group=lp dir path=usr/lib/lp/postscript group=lp dir path=usr/lib/zones dir path=usr/sbin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys file path=lib/svc/method/svc-tsol-zones mode=0555 file path=sbin/tnctl group=sys mode=0555 file path=usr/bin/getlabel mode=0555 @@ -121,7 +119,7 @@ file path=usr/sbin/tnchkdb group=sys mode=0555 file path=usr/sbin/tnd group=sys mode=0555 file path=usr/sbin/tninfo group=sys mode=0555 file path=usr/sbin/txzonemgr group=sys mode=0555 -file path=var/svc/manifest/system/tsol-zones.xml group=sys mode=0444 +file path=lib/svc/manifest/system/tsol-zones.xml group=sys mode=0444 hardlink path=usr/sbin/remove_allocatable target=add_allocatable legacy pkg=SUNWtsr arch=$(ARCH) category=system \ desc="Solaris Trusted Extensions, (Root)" \ diff --git a/usr/src/pkg/manifests/system-xvm-ipagent.mf b/usr/src/pkg/manifests/system-xvm-ipagent.mf index 873210adfa..72a1c6e65e 100644 --- a/usr/src/pkg/manifests/system-xvm-ipagent.mf +++ b/usr/src/pkg/manifests/system-xvm-ipagent.mf @@ -44,13 +44,11 @@ dir path=usr group=sys dir path=usr/lib dir path=usr/lib/xen dir path=usr/lib/xen/bin -dir path=var group=sys -dir path=var/svc group=sys -dir path=var/svc/manifest group=sys -dir path=var/svc/manifest/system group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys file path=lib/svc/method/svc-ipagent mode=0555 file path=usr/lib/xen/bin/ipagent mode=0555 -file path=var/svc/manifest/system/ipagent.xml group=sys mode=0444 +file path=lib/svc/manifest/system/ipagent.xml group=sys mode=0444 legacy pkg=SUNWxvmipar arch=$(ARCH) category=system \ desc="xVM PV IP address agent" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-zones.mf b/usr/src/pkg/manifests/system-zones.mf index f08befdc32..1beb49c533 100644 --- a/usr/src/pkg/manifests/system-zones.mf +++ b/usr/src/pkg/manifests/system-zones.mf @@ -54,12 +54,9 @@ dir path=usr/share group=sys dir path=usr/share/lib group=sys dir path=usr/share/lib/xml group=sys dir path=usr/share/lib/xml/dtd group=sys -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/svc group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest group=sys opensolaris.zone=global \ variant.opensolaris.zone=global -dir path=var/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/svc/manifest/system group=sys opensolaris.zone=global \ +dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ variant.opensolaris.zone=global driver name=zcons file path=etc/zones/SUNWblank.xml mode=0444 @@ -89,9 +86,9 @@ file path=usr/sbin/zonecfg mode=0555 file path=usr/share/lib/xml/dtd/brand.dtd.1 mode=0644 file path=usr/share/lib/xml/dtd/zone_platform.dtd.1 mode=0644 file path=usr/share/lib/xml/dtd/zonecfg.dtd.1 -file path=var/svc/manifest/system/resource-mgmt.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/resource-mgmt.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global -file path=var/svc/manifest/system/zones.xml group=sys mode=0444 \ +file path=lib/svc/manifest/system/zones.xml group=sys mode=0444 \ opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWzoner arch=$(ARCH) category=system \ desc="Solaris Zones Configuration Files" \ diff --git a/usr/src/pkg/transforms/restart_fmri b/usr/src/pkg/transforms/restart_fmri index 9da9ccdbf6..dcf722cb4b 100644 --- a/usr/src/pkg/transforms/restart_fmri +++ b/usr/src/pkg/transforms/restart_fmri @@ -25,5 +25,6 @@ # <transform file path=var/svc/manifest/.*\.xml -> add restart_fmri svc:/system/manifest-import:default> +<transform file path=lib/svc/manifest/.*\.xml -> add restart_fmri svc:/system/manifest-import:default> <transform file path=etc/security/[^/]+_attr.d/.+ -> add restart_fmri svc:/system/rbac:default> <transform file path=etc/user_attr.d/.+ -> add restart_fmri svc:/system/rbac:default> |