--- a/src/man/pkg.sysrepo.1m.txt Fri May 06 10:48:40 2011 -0700
+++ b/src/man/pkg.sysrepo.1m.txt Fri May 06 13:12:16 2011 -0700
@@ -9,11 +9,12 @@
pkg.sysrepo -p <port> [ -c cache_dir] [-s cache_size]
DESCRIPTION
- pkg.sysrepo(1M) is used to generate the configuration files
- for the IPS System Repository. This command is called by
- the svc:/system/pkg/sysrepo SMF service. Changes in confi-
- guration should be made to the properties in the SMF ser-
- vice.
+
+ pkg.sysrepo(1M) is used to generate the configuration files
+ for the IPS System Repository. This command is called by
+ the svc:/application/pkg/system-repository SMF service.
+ Changes in configuration should be made to the properties in
+ the SMF service.
The system repository is responsible for providing access to
the package repositories configured in a reference image
@@ -79,7 +80,7 @@
Example 1: Enabling the system repository
- $ svcadm enable svc:/system/pkg/sysrepo
+ $ svcadm enable svc:/application/pkg/system-repository
EXIT STATUS
--- a/src/modules/client/api_errors.py Fri May 06 10:48:40 2011 -0700
+++ b/src/modules/client/api_errors.py Fri May 06 13:12:16 2011 -0700
@@ -1713,9 +1713,9 @@
return _("""\
pkg is configured to use the system repository (via the use-system-repo
property) but it could not get the host and port from
-smf:/system/zones-proxy-client nor smf:/system/pkg/sysrepo, and the
-PKG_SYSREPO_URL environment variable was not set. Please try enabling one of
-those services or setting the PKG_SYSREPO_URL environment variable.
+smf:/system/zones-proxy-client nor smf:/application/pkg/system-repository, and
+the PKG_SYSREPO_URL environment variable was not set. Please try enabling one
+of those services or setting the PKG_SYSREPO_URL environment variable.
""")
--- a/src/modules/client/image.py Fri May 06 10:48:40 2011 -0700
+++ b/src/modules/client/image.py Fri May 06 13:12:16 2011 -0700
@@ -556,9 +556,11 @@
self.mkdirs()
self.cfg.write()
if self.is_liveroot() and \
- smf.get_state("svc:/system/pkg/sysrepo:default") in \
+ smf.get_state(
+ "svc:/application/pkg/system-repository:default") in \
(smf.SMF_SVC_TMP_ENABLED, smf.SMF_SVC_ENABLED):
- smf.refresh(["svc:/system/pkg/sysrepo:default"])
+ smf.refresh([
+ "svc:/application/pkg/system-repository:default"])
# This ensures all old transport configuration is thrown away.
self.transport = transport.Transport(
--- a/src/modules/client/imageconfig.py Fri May 06 10:48:40 2011 -0700
+++ b/src/modules/client/imageconfig.py Fri May 06 13:12:16 2011 -0700
@@ -812,11 +812,11 @@
# smf, try using pkg/sysrepo.
try:
host = smf.get_prop(
- "system/pkg/sysrepo:default",
+ "application/pkg/system-repository:default",
"config/host")
host = "localhost"
port = smf.get_prop(
- "system/pkg/sysrepo:default",
+ "application/pkg/system-repository:default",
"config/port")
except smf.NonzeroExitException, e:
raise apx.UnknownSysrepoConfiguration()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pkg/manifests/package%2Fpkg%2Fsystem-repository.p5m Fri May 06 13:12:16 2011 -0700
@@ -0,0 +1,65 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri value=pkg:/package/pkg/system-repository@$(PKGVERS)
+set name=pkg.description \
+ value="A service that provides a publisher proxy to pkg(5) clients."
+set name=pkg.summary value="IPS System Repository"
+set name=info.classification \
+ value=org.opensolaris.category.2008:System/Packaging
+set name=org.opensolaris.smf.fmri \
+ value=svc:/application/pkg/system-repository:default
+set name=variant.arch value=$(ARCH)
+dir path=etc
+dir path=etc/pkg
+dir path=etc/pkg/sysrepo
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/manifest
+dir path=lib/svc/manifest/system
+dir path=usr
+dir path=usr/lib
+dir path=usr/share/man/cat1m
+file path=usr/share/man/cat1m/pkg.sysrepo.1m
+dir path=var
+dir path=var/cache
+dir path=var/cache/pkg owner=pkg5srv
+dir path=var/cache/pkg/sysrepo owner=pkg5srv
+dir path=var/log
+dir path=var/log/pkg
+dir path=var/log/pkg/sysrepo
+file path=lib/svc/manifest/application/pkg-system-repository.xml
+file path=lib/svc/method/svc-pkg-sysrepo
+file path=usr/lib/pkg.sysrepo mode=0755
+file path=etc/pkg/sysrepo/sysrepo_httpd.conf.mako
+file path=etc/pkg/sysrepo/sysrepo_publisher_response.mako
+# we deliver 0-byte log file stubs
+file path=var/log/pkg/sysrepo/access_log preserve=renamenew
+file path=var/log/pkg/sysrepo/error_log preserve=renamenew
+license cr_Oracle license=cr_Oracle
+# manual dependencies on pkg and python can be detected by
+# pkgdepend once in use on our gate. The manual dependency
+# on apache results from our calling apachectl from our
+# method script, and can't be detected by pkgdepend.
+depend fmri=package/pkg type=require
+depend fmri=runtime/[email protected] type=require
+depend fmri=web/server/apache-22 type=require
--- a/src/pkg/manifests/package%2Fsysrepo.p5m Fri May 06 10:48:40 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-set name=pkg.fmri value=pkg:/package/sysrepo@$(PKGVERS)
-set name=pkg.description \
- value="A service that provides a publisher proxy to pkg(5) clients."
-set name=pkg.summary value="IPS System Repository"
-set name=info.classification \
- value=org.opensolaris.category.2008:System/Packaging
-set name=opensolaris.smf.fmri value=svc:/system/pkg/sysrepo:default
-set name=variant.arch value=$(ARCH)
-dir path=etc
-dir path=etc/pkg
-dir path=etc/pkg/sysrepo
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest
-dir path=lib/svc/manifest/system
-dir path=usr
-dir path=usr/lib
-dir path=usr/share/man/cat1m
-file path=usr/share/man/cat1m/pkg.sysrepo.1m
-dir path=var
-dir path=var/cache
-dir path=var/cache/pkg owner=pkg5srv
-dir path=var/cache/pkg/sysrepo owner=pkg5srv
-dir path=var/log
-dir path=var/log/pkg
-dir path=var/log/pkg/sysrepo
-file path=lib/svc/manifest/system/pkg-sysrepo.xml
-file path=lib/svc/method/svc-pkg-sysrepo
-file path=usr/lib/pkg.sysrepo mode=0755
-file path=etc/pkg/sysrepo/sysrepo_httpd.conf.mako
-file path=etc/pkg/sysrepo/sysrepo_publisher_response.mako
-# we deliver 0-byte log file stubs
-file path=var/log/pkg/sysrepo/access_log preserve=renamenew
-file path=var/log/pkg/sysrepo/error_log preserve=renamenew
-license cr_Oracle license=cr_Oracle
-# manual dependencies on pkg and python can be detected by
-# pkgdepend once in use on our gate. The manual dependency
-# on apache results from our calling apachectl from our
-# method script, and can't be detected by pkgdepend.
-depend fmri=package/pkg type=require
-depend fmri=runtime/[email protected] type=require
-depend fmri=web/server/apache-22 type=require
--- a/src/pkg/pkglint_whitelist.txt Fri May 06 10:48:40 2011 -0700
+++ b/src/pkg/pkglint_whitelist.txt Fri May 06 13:12:16 2011 -0700
@@ -1,5 +1,5 @@
WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/SUNWcs for pkg://pkg5-nightly/package/pkg
-WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/SUNWcs for pkg://pkg5-nightly/system/desktop/ldtp
+WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/SUNWcs for pkg://pkg5-nightly/package/pkg/update-manager
WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/SUNWcs for pkg://pkg5-nightly/system/zones/brand/ipkg
WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/archiver/gnu-tar for pkg://pkg5-nightly/package/pkg/update-manager
WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/communication/im/pidgin for pkg://pkg5-nightly/system/trusted/trusted-nonglobal
@@ -97,7 +97,7 @@
WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/text/gnu-grep for pkg://pkg5-nightly/package/pkg/update-manager
WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/text/tidy for pkg://pkg5-nightly/developer/opensolaris/pkg5
WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/web/curl for pkg://pkg5-nightly/library/python-2/pycurl
-WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/web/server/apache-22 for pkg://pkg5-nightly/package/sysrepo
+WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/web/server/apache-22 for pkg://pkg5-nightly/developer/opensolaris/pkg5
WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/web/wget for pkg://pkg5-nightly/package/pkg/update-manager
WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/x11/library/libx11 for pkg://pkg5-nightly/developer/opensolaris/pkg5
WARNING pkglint.action005.1 obsolete dependency check skipped: unable to find dependency pkg:/x11/trusted/libxtsol for pkg://pkg5-nightly/system/trusted/trusted-nonglobal
--- a/src/setup.py Fri May 06 10:48:40 2011 -0700
+++ b/src/setup.py Fri May 06 13:12:16 2011 -0700
@@ -335,10 +335,10 @@
smf_app_files = [
'svc/pkg-mdns.xml',
'svc/pkg-server.xml',
+ 'svc/pkg-system-repository.xml',
'svc/pkg-update.xml',
]
smf_sys_files = [
- 'svc/pkg-sysrepo.xml',
]
resource_files = [
'util/opensolaris.org.sections',
--- a/src/svc/pkg-sysrepo.xml Fri May 06 10:48:40 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-<?xml version="1.0"?>
-<!--
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
- Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-
- NOTE: This service manifest is not editable; its contents will
- be overwritten by package or patch operations, including
- operating system upgrade. Make customizations in a different
- file.
--->
-
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-
-<service_bundle type='manifest' name='pkg:sysrepo'>
-
-<service
- name='system/pkg/sysrepo'
- type='service'
- version='1'>
-
- <instance name='default' enabled='false'>
- <!--
- Wait for network interfaces to be initialized.
- -->
- <dependency name='network'
- grouping='require_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/milestone/network:default'/>
- </dependency>
-
- <!--
- Wait for all local filesystems to be mounted.
- -->
- <dependency name='filesystem-local'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri
- value='svc:/system/filesystem/local:default'/>
- </dependency>
-
- <!--
- Wait for automounting to be available, as we may be
- serving data from home directories or other remote
- filesystems.
- -->
- <dependency name='autofs'
- grouping='optional_all'
- restart_on='error'
- type='service'>
- <service_fmri
- value='svc:/system/filesystem/autofs:default'/>
- </dependency>
-
- <exec_method
- type='method'
- name='start'
- exec='/lib/svc/method/svc-pkg-sysrepo start'
- timeout_seconds='60' />
-
- <exec_method
- type='method'
- name='stop'
- exec='/lib/svc/method/svc-pkg-sysrepo stop'
- timeout_seconds='60' />
-
- <exec_method
- type='method'
- name='refresh'
- exec='/lib/svc/method/svc-pkg-sysrepo refresh'
- timeout_seconds='60' />
-
- <property_group name='config' type='application'>
- <stability value='Evolving' />
- <!-- The port we listen on -->
- <propval name='port' type='count' value='1008' />
- <!-- The host we're running on -->
- <propval name='host' type='astring' value='127.0.0.1' />
- <!-- Where we store apache logs -->
- <propval name='log_dir' type='astring'
- value='/var/log/pkg/sysrepo' />
- <!-- Where we store runtime versions of our
- configuration -->
- <propval name='runtime_dir' type='astring'
- value='/system/volatile/pkg/sysrepo' />
- <!-- Where we store our Mako templates for generating
- runtime configuration -->
- <propval name='template_dir' type='astring'
- value='/etc/pkg/sysrepo' />
- <!-- Where we store our sysrepo apache cache
- If cache_dir is set to the special value "None" then we
- do not perform caching. If cache_dir is set to the
- special value "memory" we use an in-memory cache.
- -->
- <propval name='cache_dir' type='astring'
- value='/var/cache/pkg/sysrepo' />
- <!-- Our maximum cache size, expressed in MB -->
- <propval name='cache_max' type='count' value='1024' />
-
- <propval name='value_authorization' type='astring'
- value='solaris.smf.value.pkg-sysrepo' />
- </property_group>
-
- <property_group name='general' type='framework'>
- <propval name='action_authorization'
- type='astring'
- value='solaris.smf.manage.pkg-sysrepo' />
- <propval name='value_authorization'
- type='astring'
- value='solaris.smf.value.pkg-sysrepo' />
- </property_group>
-
- <property_group name='startd' type='framework'>
- <!-- sub-process core dumps shouldn't restart
- session -->
- <propval name='ignore_error' type='astring'
- value='core,signal' />
- </property_group>
-
- <template>
- <common_name>
- <loctext xml:lang='C'>
- IPS System Repository
- </loctext>
- </common_name>
- <documentation>
- <manpage title='pkg.sysrepo' section='1M' />
- </documentation>
- </template>
-
- </instance>
-
- <stability value='Evolving' />
-
-</service>
-
-</service_bundle>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/svc/pkg-system-repository.xml Fri May 06 13:12:16 2011 -0700
@@ -0,0 +1,156 @@
+<?xml version="1.0"?>
+<!--
+ CDDL HEADER START
+
+ The contents of this file are subject to the terms of the
+ Common Development and Distribution License (the "License").
+ You may not use this file except in compliance with the License.
+
+ You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ or http://www.opensolaris.org/os/licensing.
+ See the License for the specific language governing permissions
+ and limitations under the License.
+
+ When distributing Covered Code, include this CDDL HEADER in each
+ file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ If applicable, add the following below this CDDL HEADER, with the
+ fields enclosed by brackets "[]" replaced with your own identifying
+ information: Portions Copyright [yyyy] [name of copyright owner]
+
+ CDDL HEADER END
+
+ Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+
+ NOTE: This service manifest is not editable; its contents will
+ be overwritten by package or patch operations, including
+ operating system upgrade. Make customizations in a different
+ file.
+-->
+
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+
+<service_bundle type='manifest' name='pkg:system-repository'>
+
+<service
+ name='application/pkg/system-repository'
+ type='service'
+ version='1'>
+
+ <instance name='default' enabled='false'>
+ <!--
+ Wait for network interfaces to be initialized.
+ -->
+ <dependency name='network'
+ grouping='require_all'
+ restart_on='error'
+ type='service'>
+ <service_fmri value='svc:/milestone/network:default'/>
+ </dependency>
+
+ <!--
+ Wait for all local filesystems to be mounted.
+ -->
+ <dependency name='filesystem-local'
+ grouping='require_all'
+ restart_on='none'
+ type='service'>
+ <service_fmri
+ value='svc:/system/filesystem/local:default'/>
+ </dependency>
+
+ <!--
+ Wait for automounting to be available, as we may be
+ serving data from home directories or other remote
+ filesystems.
+ -->
+ <dependency name='autofs'
+ grouping='optional_all'
+ restart_on='error'
+ type='service'>
+ <service_fmri
+ value='svc:/system/filesystem/autofs:default'/>
+ </dependency>
+
+ <exec_method
+ type='method'
+ name='start'
+ exec='/lib/svc/method/svc-pkg-sysrepo start'
+ timeout_seconds='60' />
+
+ <exec_method
+ type='method'
+ name='stop'
+ exec='/lib/svc/method/svc-pkg-sysrepo stop'
+ timeout_seconds='60' />
+
+ <exec_method
+ type='method'
+ name='refresh'
+ exec='/lib/svc/method/svc-pkg-sysrepo refresh'
+ timeout_seconds='60' />
+
+ <property_group name='config' type='application'>
+ <stability value='Evolving' />
+ <!-- The port we listen on -->
+ <propval name='port' type='count' value='1008' />
+ <!-- The host we're running on -->
+ <propval name='host' type='astring' value='127.0.0.1' />
+ <!-- Where we store apache logs -->
+ <propval name='log_dir' type='astring'
+ value='/var/log/pkg/sysrepo' />
+ <!-- Where we store runtime versions of our
+ configuration -->
+ <propval name='runtime_dir' type='astring'
+ value='/system/volatile/pkg/sysrepo' />
+ <!-- Where we store our Mako templates for generating
+ runtime configuration -->
+ <propval name='template_dir' type='astring'
+ value='/etc/pkg/sysrepo' />
+ <!-- Where we store our sysrepo apache cache
+ If cache_dir is set to the special value "None" then we
+ do not perform caching. If cache_dir is set to the
+ special value "memory" we use an in-memory cache.
+ -->
+ <propval name='cache_dir' type='astring'
+ value='/var/cache/pkg/sysrepo' />
+ <!-- Our maximum cache size, expressed in MB -->
+ <propval name='cache_max' type='count' value='1024' />
+
+ <propval name='value_authorization' type='astring'
+ value='solaris.smf.value.pkg-sysrepo' />
+ </property_group>
+
+ <property_group name='general' type='framework'>
+ <propval name='action_authorization'
+ type='astring'
+ value='solaris.smf.manage.pkg-sysrepo' />
+ <propval name='value_authorization'
+ type='astring'
+ value='solaris.smf.value.pkg-sysrepo' />
+ </property_group>
+
+ <property_group name='startd' type='framework'>
+ <!-- sub-process core dumps shouldn't restart
+ session -->
+ <propval name='ignore_error' type='astring'
+ value='core,signal' />
+ </property_group>
+
+ <template>
+ <common_name>
+ <loctext xml:lang='C'>
+ IPS System Repository
+ </loctext>
+ </common_name>
+ <documentation>
+ <manpage title='pkg.sysrepo' section='1M' />
+ </documentation>
+ </template>
+
+ </instance>
+
+ <stability value='Evolving' />
+
+</service>
+
+</service_bundle>
--- a/src/sysrepo.py Fri May 06 10:48:40 2011 -0700
+++ b/src/sysrepo.py Fri May 06 13:12:16 2011 -0700
@@ -63,7 +63,7 @@
#
# This is a simple python script, run from the method script that starts
-# svc:/system/pkg/sysrepo:default.
+# svc:/application/pkg/system-repository:default.
#
# It writes an Apache configuration that is used to serve responses to pkg
# clients querying the system repository, as well as providing http/https proxy
--- a/src/tests/cli/t_pkg_sysrepo.py Fri May 06 10:48:40 2011 -0700
+++ b/src/tests/cli/t_pkg_sysrepo.py Fri May 06 13:12:16 2011 -0700
@@ -1323,7 +1323,7 @@
}
if len(pargs) != 2 or pargs[0] != "restart" or \
- pargs[1] != "svc:/system/pkg/sysrepo":
+ pargs[1] != "svc:/application/pkg/system-repository":
sys.exit(1)
sys.exit(0)
"""}
--- a/src/util/apache2/sysrepo/sysrepo_httpd.conf.mako Fri May 06 10:48:40 2011 -0700
+++ b/src/util/apache2/sysrepo/sysrepo_httpd.conf.mako Fri May 06 13:12:16 2011 -0700
@@ -8,8 +8,8 @@
#
# This is an automatically generated file for the IPS system publisher, and
# should not be modified directly. Changes made to this file will be
-# overwritten the next time svc:/system/pkg/sysrepo:default is refreshed or
-# restarted.
+# overwritten the next time svc:/application/pkg/system-repository:default is
+# refreshed or restarted.
#
""")
%>