PSARC/2010/169 EOF lx brand

6959264 EOF lx brand
illumos · Jun 11, 2010 · eb5a5c7 · eb5a5c7
1 parent c2b2c94
commit eb5a5c7
Show file tree

Hide file tree

Showing 186 changed files with 42 additions and 49,543 deletions.
diff --git a/usr/src/Makefile.lint b/usr/src/Makefile.lint
@@ -480,7 +480,6 @@ i386_SUBDIRS= \
 	cmd/biosdev \
 	cmd/rtc \
 	cmd/ucodeadm \
-	lib/brand/lx \
 	lib/cfgadm_plugins/sata \
 	lib/cfgadm_plugins/sbd \
 	lib/libfdisk

diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
@@ -45,9 +45,6 @@ i386_DIRS= \
 	/boot/grub \
 	/boot/grub/bin \
 	/platform/i86pc \
-	/usr/lib/brand/lx \
-	/usr/lib/brand/lx/amd64 \
-	/usr/lib/brand/lx/distros \
 	/usr/lib/xen \
 	/usr/lib/xen/bin
 
@@ -513,9 +510,6 @@ SYM.DIRS= \
 	/usr/ucblib/32 \
 	/var/ld/32
 
-i386_SYM.DIRS64= \
-	/usr/lib/brand/lx/64
-
 sparc_SYM.DIRS64=
 
 SYM.DIRS64= \
@@ -632,7 +626,6 @@ $(BUILD64) $(ROOT)/lib/crypto/64:=	LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/lib/secure/64:=	LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/lib/64:=		LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/lib/elfedit/64:=	LINKDEST=$(MACH64)
-$(BUILD64) $(ROOT)/usr/lib/brand/lx/64:=	LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/lib/brand/sn1/64:=	LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/lib/brand/solaris10/64:=	LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/lib/libp/64:=	LINKDEST=$(MACH64)

diff --git a/usr/src/cmd/devfsadm/i386/Makefile b/usr/src/cmd/devfsadm/i386/Makefile
@@ -19,18 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 LINK_OBJS_i386 = \
 	misc_link_i386.o \
-	lx_link_i386.o \
 	xen_link.o
 
-lx_link_i386.o lx_link_i386.po lx_link_i386.ln := CPPFLAGS += -I$(UTSBASE)/common/brand/lx
-
 xen_link.o xen_link.ln xen_link.po := CPPFLAGS += -I$(UTSBASE)/i86xpv
 
 include ../Makefile.com

diff --git a/usr/src/cmd/devfsadm/i386/lx_link_i386.c b/usr/src/cmd/devfsadm/i386/lx_link_i386.c
diff --git a/usr/src/cmd/truss/codes.c b/usr/src/cmd/truss/codes.c
@@ -382,9 +382,6 @@ const struct ioc {
 	{ (uint_t)TIOCSILOOP,	"TIOCSILOOP",	NULL },
 	{ (uint_t)TIOCCILOOP,	"TIOCSILOOP",	NULL },
 
-	{ (uint_t)TIOCSETLD,	"TIOCSETLD",	NULL },
-	{ (uint_t)TIOCGETLD,	"TIOCGETLD",	NULL },
-
 	{ (uint_t)TIOCGPPS,	"TIOCGPPS",	NULL },
 	{ (uint_t)TIOCSPPS,	"TIOCSPPS",	NULL },
 	{ (uint_t)TIOCGPPSEV,	"TIOCGPPSEV",	NULL },

diff --git a/usr/src/cmd/zlogin/zlogin.c b/usr/src/cmd/zlogin/zlogin.c
@@ -2181,18 +2181,8 @@ main(int argc, char **argv)
 		/*
 		 * In failsafe mode, we don't use login(1), so don't try
 		 * setting up a utmpx entry.
-		 *
-		 * A branded zone may have very different utmpx semantics.
-		 * At the moment, we only have two brand types:
-		 * Solaris-like (native, sn1) and Linux.  In the Solaris
-		 * case, we know exactly how to do the necessary utmpx
-		 * setup.  Fortunately for us, the Linux /bin/login is
-		 * prepared to deal with a non-initialized utmpx entry, so
-		 * we can simply skip it.  If future brands don't fall into
-		 * either category, we'll have to add a per-brand utmpx
-		 * setup hook.
 		 */
-		if (!failsafe && (strcmp(zonebrand, "lx") != 0))
+		if (!failsafe)
 			if (setup_utmpx(slaveshortname) == -1)
 				return (1);
 

diff --git a/usr/src/cmd/zoneadm/svc-zones b/usr/src/cmd/zoneadm/svc-zones
@@ -20,21 +20,18 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 
 . /lib/svc/share/smf_include.sh
 
 #
 # Return a list of running, non-global zones for which a shutdown via
 # "/sbin/init 0" may work (typically only Solaris zones.)
 #
-# At present, this means any running "lx" zones don't qualify.
-#
 shutdown_zones()
 {
 	zoneadm list -p | nawk -F: '{
-		if (($5 != "lx") && ($2 != "global")) {
+		if ($2 != "global") {
 			print $2
 		}
 	}'