On 07/ 5/11 08:01 PM, Edward Pilatowicz wrote:
On Tue, Jul 05, 2011 at 07:52:07PM -0400, Sebastien Roy wrote:
On 07/ 5/11 07:29 PM, Alan Coopersmith wrote:
On 07/ 5/11 04:07 PM, Sebastien Roy wrote:
dir path=etc/zones
-file path=etc/zones/SUNWipkg.xml
Shouldn't you also remove the dir action entry now that you're not delivering
any files in there?
Yes indeed; removed.
once you remove that directory from the manifest you can also remove
references to ROOTETCZONES from src/brand/Makefile.
otherwise lgtm.
Thanks, here's the updated set of diffs:
description:
PSARC/2011/232 exclusive-ip zones by default
7046048 zonecfg ip-type=exclusive by default
modified:
src/brand/Makefile
src/pkg/manifests/system%2Fzones%2Fbrand%2Fipkg.p5m
removed:
src/brand/SUNWipkg.xml
diff -r 04032d3e71d9 -r d9cf6dc3a968 src/brand/Makefile
--- a/src/brand/Makefile Fri Jul 01 12:40:12 2011 -0700
+++ b/src/brand/Makefile Tue Jul 05 20:52:47 2011 -0400
@@ -29,7 +29,6 @@
ROOT = ../../proto/root_${MACH}
ROOTETC = $(ROOT)/etc
-ROOTETCZONES = $(ROOT)/etc/zones
ROOTETCBRAND = $(ROOT)/etc/brand/ipkg
ROOTUSRLIB = $(ROOT)/usr/lib
ROOTBRAND = $(ROOTUSRLIB)/brand
@@ -41,7 +40,6 @@
$(ROOT) \
$(ROOTETC) \
$(ROOTETCBRAND) \
- $(ROOTETCZONES) \
$(ROOTUSRLIB) \
$(ROOTBRAND) \
$(ROOTBRANDPKG)
@@ -67,8 +65,7 @@
$(ROOTBRANDPKG)/pkgrm.lst \
$(ROOTBRANDPKG)/smf_disable.lst \
$(ROOTETCBRAND)/pkgrm.conf \
- $(ROOTETCBRAND)/smf_disable.conf \
- $(ROOTETCZONES)/SUNWipkg.xml \
+ $(ROOTETCBRAND)/smf_disable.conf
BIN = \
support \
@@ -98,15 +95,12 @@
install: $(ROOTFILES) $(ROOTBINS)
-$(ROOT) $(ROOTETC) $(ROOTETCBRAND) $(ROOTETCZONES) $(ROOTUSRLIB) \
+$(ROOT) $(ROOTETC) $(ROOTETCBRAND) $(ROOTUSRLIB) \
$(ROOTBRAND) $(ROOTBRANDPKG):
mkdir -p $@
$(ROOTETCBRAND)/%: $(ROOTETCBRAND) %
rm -f $@; $(INSTALL) -f $(ROOTETCBRAND) -m $(FILEMODE) $<
-$(ROOTETCZONES)/%: $(ROOTETCZONES) %
- rm -f $@; $(INSTALL) -f $(ROOTETCZONES) -m $(FILEMODE) $<
-
$(ROOTBRANDPKG)/%: $(ROOTBRANDPKG) %
rm -f $@; $(INSTALL) -f $(ROOTBRANDPKG) -m $(FILEMODE) $<
diff -r 04032d3e71d9 -r d9cf6dc3a968 src/brand/SUNWipkg.xml
--- a/src/brand/SUNWipkg.xml Fri Jul 01 12:40:12 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2007 Sun Microsystems, Inc. All rights reserved.
- Use is subject to license terms.
-
- 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
-
- DO NOT EDIT THIS FILE. Use zonecfg(1M) instead.
--->
-
-<!DOCTYPE zone PUBLIC "-//Sun Microsystems Inc//DTD Zones//EN"
"file:///usr/share/lib/xml/dtd/zonecfg.dtd.1">
-
-<zone name="default" zonepath="" autoboot="false" brand="ipkg">
-</zone>
diff -r 04032d3e71d9 -r d9cf6dc3a968
src/pkg/manifests/system%2Fzones%2Fbrand%2Fipkg.p5m
--- a/src/pkg/manifests/system%2Fzones%2Fbrand%2Fipkg.p5m Fri Jul
01 12:40:12 2011 -0700
+++ b/src/pkg/manifests/system%2Fzones%2Fbrand%2Fipkg.p5m Tue Jul
05 20:52:47 2011 -0400
@@ -32,8 +32,6 @@
dir path=etc/brand/ipkg
file path=etc/brand/ipkg/pkgrm.conf mode=0644 preserve=true
original_name=SUNWipkg-brand:etc/brand/ipkg/pkgrm.conf
file path=etc/brand/ipkg/smf_disable.conf mode=0644 preserve=true
original_name=SUNWipkg-brand:etc/brand/ipkg/smf_disable.conf
-dir path=etc/zones
-file path=etc/zones/SUNWipkg.xml
dir path=usr
dir path=usr/lib
dir path=usr/lib/brand
-Seb
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
