On 07/ 5/11 09:03 PM, Edward Pilatowicz wrote:
lgtm. ed
I've attached the output of hg export for the changeset. -Seb
# HG changeset patch # User Sebastien Roy <[email protected]> # Date 1309913567 14400 # Node ID d9cf6dc3a9682fe62d67eda4d3c5d6aaa3afe9a7 # Parent 04032d3e71d93a6d68465cf754e42c57cd1e0eef PSARC/2011/232 exclusive-ip zones by default 7046048 zonecfg ip-type=exclusive by default 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
_______________________________________________ pkg-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
