changeset 2:71260a2d157b

fix the manifest and add lx26 brand template
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Tue, 26 Jul 2011 03:22:05 +0100
parents 9934e5e0bbd7
children 1929af3c6835
files lx-fixes series zone-conf-xml
diffstat 3 files changed, 43 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lx-fixes	Mon Jul 25 03:57:07 2011 +0100
+++ b/lx-fixes	Tue Jul 26 03:22:05 2011 +0100
@@ -1,6 +1,6 @@
 diff -r baa5e56a424f usr/src/lib/brand/lx/lx_brand/common/lx_brand.c
 --- a/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c	Sun Jul 24 00:41:06 2011 +0100
-+++ b/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c	Mon Jul 25 03:56:56 2011 +0100
++++ b/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c	Mon Jul 25 04:21:12 2011 +0100
 @@ -625,8 +625,6 @@
  	(void) close(fd_new);
  }
@@ -27,7 +27,7 @@
  
 diff -r baa5e56a424f usr/src/lib/brand/lx/lx_support/lx_support.c
 --- a/usr/src/lib/brand/lx/lx_support/lx_support.c	Sun Jul 24 00:41:06 2011 +0100
-+++ b/usr/src/lib/brand/lx/lx_support/lx_support.c	Mon Jul 25 03:56:56 2011 +0100
++++ b/usr/src/lib/brand/lx/lx_support/lx_support.c	Mon Jul 25 04:21:12 2011 +0100
 @@ -455,20 +455,6 @@
  	}
  
@@ -49,9 +49,21 @@
  	 * Check to see whether the zone has any ZFS datasets configured.
  	 */
  	if (zonecfg_setdsent(handle) != Z_OK) {
+diff -r baa5e56a424f usr/src/pkg/manifests/system-zones-brand-lx.mf
+--- a/usr/src/pkg/manifests/system-zones-brand-lx.mf	Sun Jul 24 00:41:06 2011 +0100
++++ b/usr/src/pkg/manifests/system-zones-brand-lx.mf	Mon Jul 25 04:21:12 2011 +0100
+@@ -28,7 +28,7 @@
+ # non-global.  The files, directories, links, and hardlinks, however,
+ # will only be installed into the global zone.
+ #
+-<include hollow_zone_pkg>
++<include global_zone_only_component>
+ set name=pkg.fmri value=pkg:/system/zones/brand/lx@$(PKGVERS)
+ set name=pkg.description value="Support for the 'lx' Brand"
+ set name=pkg.summary value="lx Brand"
 diff -r baa5e56a424f usr/src/uts/common/brand/lx/procfs/lx_prvfsops.c
 --- a/usr/src/uts/common/brand/lx/procfs/lx_prvfsops.c	Sun Jul 24 00:41:06 2011 +0100
-+++ b/usr/src/uts/common/brand/lx/procfs/lx_prvfsops.c	Mon Jul 25 03:56:56 2011 +0100
++++ b/usr/src/uts/common/brand/lx/procfs/lx_prvfsops.c	Mon Jul 25 04:21:12 2011 +0100
 @@ -223,7 +223,7 @@
  	/*
  	 * Having the resource be anything but "lxproc" doesn't make sense
@@ -63,7 +75,7 @@
  
 diff -r baa5e56a424f usr/src/uts/common/brand/lx/procfs/lx_prvnops.c
 --- a/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c	Sun Jul 24 00:41:06 2011 +0100
-+++ b/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c	Mon Jul 25 03:56:56 2011 +0100
++++ b/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c	Mon Jul 25 04:21:12 2011 +0100
 @@ -1927,7 +1927,7 @@
  		lxpr_uiobuf_printf(uiobuf, "cache size\t: %u KB\n",
  		    getl2cacheinfo(cp, NULL, NULL, NULL) / 1024);
@@ -75,7 +87,7 @@
  			 */
 diff -r baa5e56a424f usr/src/uts/common/os/pid.c
 --- a/usr/src/uts/common/os/pid.c	Sun Jul 24 00:41:06 2011 +0100
-+++ b/usr/src/uts/common/os/pid.c	Mon Jul 25 03:56:56 2011 +0100
++++ b/usr/src/uts/common/os/pid.c	Mon Jul 25 04:21:12 2011 +0100
 @@ -112,6 +112,18 @@
  	return (pidp);
  }
@@ -97,7 +109,7 @@
  {
 diff -r baa5e56a424f usr/src/uts/common/sys/proc.h
 --- a/usr/src/uts/common/sys/proc.h	Sun Jul 24 00:41:06 2011 +0100
-+++ b/usr/src/uts/common/sys/proc.h	Mon Jul 25 03:56:56 2011 +0100
++++ b/usr/src/uts/common/sys/proc.h	Mon Jul 25 04:21:12 2011 +0100
 @@ -623,6 +623,7 @@
  
  extern void pid_setmin(void);
--- a/series	Mon Jul 25 03:57:07 2011 +0100
+++ b/series	Tue Jul 26 03:22:05 2011 +0100
@@ -1,2 +1,3 @@
 lx
 lx-fixes
+zone-conf-xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zone-conf-xml	Tue Jul 26 03:22:05 2011 +0100
@@ -0,0 +1,24 @@
+diff -r 651ae0c2678c usr/src/lib/brand/lx/zone/Makefile
+--- a/usr/src/lib/brand/lx/zone/Makefile	Mon Jul 25 17:54:56 2011 +0100
++++ b/usr/src/lib/brand/lx/zone/Makefile	Tue Jul 26 02:51:47 2011 +0100
+@@ -29,7 +29,7 @@
+ PROGS =	lx_install lx_distro_install lx_init_zone
+ SUBDIRS = distros
+ XMLDOCS =	config.xml platform.xml
+-TEMPLATES =	SUNWlx.xml
++TEMPLATES =	SUNWlx.xml SUNWlx26.xml
+ 
+ all:	$(PROGS)
+ 
+diff -r 651ae0c2678c usr/src/lib/brand/lx/zone/SUNWlx.xml
+--- a/usr/src/lib/brand/lx/zone/SUNWlx.xml	Mon Jul 25 17:54:56 2011 +0100
++++ b/usr/src/lib/brand/lx/zone/SUNWlx.xml	Tue Jul 26 02:51:47 2011 +0100
+@@ -23,8 +23,6 @@
+ 
+  CDDL HEADER END
+ 
+-    ident	"%Z%%M%	%I%	%E% SMI"
+-
+     DO NOT EDIT THIS FILE.  Use zonecfg(1M) instead.
+ -->
+