summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/Targetdirs16
-rw-r--r--usr/src/cmd/zoneadm/zfs.c14
-rw-r--r--usr/src/lib/brand/Makefile.brand7
-rw-r--r--usr/src/lib/brand/lx/cmd/Makefile2
-rw-r--r--usr/src/lib/brand/lx/librtld_db/Makefile2
-rw-r--r--usr/src/lib/brand/lx/librtld_db/amd64/Makefile2
-rw-r--r--usr/src/lib/brand/lx/librtld_db/i386/Makefile2
-rw-r--r--usr/src/lib/brand/lx/lx_brand/i386/lx_handler.s4
-rw-r--r--usr/src/lib/brand/lx/lx_nametoaddr/Makefile2
-rw-r--r--usr/src/lib/brand/lx/lx_nametoaddr/amd64/Makefile2
-rw-r--r--usr/src/lib/brand/lx/lx_nametoaddr/i386/Makefile2
-rw-r--r--usr/src/lib/brand/lx/lx_support/Makefile2
-rw-r--r--usr/src/lib/brand/lx/lx_support/lx_support.c3
-rw-r--r--usr/src/lib/brand/lx/lx_thunk/Makefile2
-rw-r--r--usr/src/lib/brand/lx/lx_thunk/amd64/Makefile2
-rw-r--r--usr/src/lib/brand/lx/lx_thunk/i386/Makefile2
-rw-r--r--usr/src/lib/brand/lx/netfiles/Makefile2
-rw-r--r--usr/src/lib/brand/lx/zone/Makefile3
-rw-r--r--usr/src/lib/brand/lx/zone/distros/Makefile2
-rw-r--r--usr/src/lib/brand/native/zone/Makefile3
-rw-r--r--usr/src/lib/brand/sn1/zone/Makefile3
-rw-r--r--usr/src/lib/libzfs/common/libzfs_dataset.c4
-rw-r--r--usr/src/uts/i86pc/ml/syscall_asm.s6
23 files changed, 49 insertions, 40 deletions
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index 6c8134fd5e..ddacfe9471 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -171,7 +171,10 @@ XROOT.BIN= \
/usr/lib/inet/wanboot
# EXPORT DELETE END
-i386_ROOT.BIN=
+i386_ROOT.BIN= \
+ /usr/lib/brand/lx \
+ /usr/lib/brand/lx/amd64 \
+ /usr/lib/brand/lx/distros
sparc_ROOT.BIN= \
/usr/lib/ldoms
@@ -211,6 +214,9 @@ ROOT.BIN= \
/usr/include/security \
/usr/lib \
/usr/lib/abi \
+ /usr/lib/brand \
+ /usr/lib/brand/native \
+ /usr/lib/brand/sn1 \
/usr/lib/class \
/usr/lib/class/FSS \
/usr/lib/class/FX \
@@ -429,7 +435,14 @@ SYM.ROOT.BIN= \
/var/ld/32 \
/usr/ucblib/32
+
+i386_SYM.ROOT.BIN64= \
+ /usr/lib/brand/lx/64
+
+sparc_SYM.ROOT.BIN64=
+
SYM.ROOT.BIN64= \
+ $($(MACH)_SYM.ROOT.BIN64) \
/lib/64 \
/lib/secure/64 \
/usr/lib/64 \
@@ -576,6 +589,7 @@ $(ROOT)/usr/ucblib/32:= LINKDEST=.
$(BUILD64) $(ROOT)/lib/64:= LINKDEST=$(MACH64)
$(BUILD64) $(ROOT)/lib/secure/64:= LINKDEST=$(MACH64)
$(BUILD64) $(ROOT)/usr/lib/64:= LINKDEST=$(MACH64)
+$(BUILD64) $(ROOT)/usr/lib/brand/lx/64:= LINKDEST=$(MACH64)
$(BUILD64) $(ROOT)/usr/lib/libp/64:= LINKDEST=$(MACH64)
$(BUILD64) $(ROOT)/usr/lib/lwp/64:= LINKDEST=$(MACH64)
$(BUILD64) $(ROOT)/usr/lib/link_audit/64:= LINKDEST=$(MACH64)
diff --git a/usr/src/cmd/zoneadm/zfs.c b/usr/src/cmd/zoneadm/zfs.c
index dfb17534a9..24569614c1 100644
--- a/usr/src/cmd/zoneadm/zfs.c
+++ b/usr/src/cmd/zoneadm/zfs.c
@@ -415,9 +415,10 @@ clone_snap(char *snapshot_name, char *zonepath)
(void) printf(gettext("Cloning snapshot %s\n"), snapshot_name);
if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0 ||
- nvlist_add_boolean_value(props,
- zfs_prop_to_name(ZFS_PROP_SHARENFS), B_FALSE) != 0) {
- nvlist_free(props);
+ nvlist_add_string(props, zfs_prop_to_name(ZFS_PROP_SHARENFS),
+ "off") != 0) {
+ if (props != NULL)
+ nvlist_free(props);
(void) fprintf(stderr, gettext("could not create ZFS clone "
"%s: out of memory\n"), zonepath);
return (Z_ERR);
@@ -710,9 +711,10 @@ create_zfs_zonepath(char *zonepath)
return;
if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0 ||
- nvlist_add_boolean_value(props, zfs_prop_to_name(ZFS_PROP_SHARENFS),
- B_FALSE) != 0) {
- nvlist_free(props);
+ nvlist_add_string(props, zfs_prop_to_name(ZFS_PROP_SHARENFS),
+ "off") != 0) {
+ if (props != NULL)
+ nvlist_free(props);
(void) fprintf(stderr, gettext("cannot create ZFS dataset %s: "
"out of memory\n"), zfs_name);
}
diff --git a/usr/src/lib/brand/Makefile.brand b/usr/src/lib/brand/Makefile.brand
index 7811875d66..78a4ceb698 100644
--- a/usr/src/lib/brand/Makefile.brand
+++ b/usr/src/lib/brand/Makefile.brand
@@ -61,13 +61,6 @@ $(ROOTPROGS) := FILEMODE = 755
$(ROOTPROGS) := OWNER = root
$(ROOTPROGS) := GROUP = bin
-$(ROOTBRANDDIR) $(ROOTTEMPLATEDIR):
- $(INS.dir)
-
-$(ROOTBRANDDIR64):
- $(INS.dir); cd $(ROOTBRANDDIR); \
- $(RM) 64; $(SYMLINK) $(MACH64) 64;
-
$(ROOTBRANDDIR)/% $(ROOTBRANDDIR64)/% $(ROOTTEMPLATEDIR)/%: %
$(INS.file)
diff --git a/usr/src/lib/brand/lx/cmd/Makefile b/usr/src/lib/brand/lx/cmd/Makefile
index 6b096dd129..1519961954 100644
--- a/usr/src/lib/brand/lx/cmd/Makefile
+++ b/usr/src/lib/brand/lx/cmd/Makefile
@@ -39,7 +39,7 @@ lint:
all: $(PROGS)
-install: all $(ROOTBRANDDIR) $(ROOTPROGS)
+install: all $(ROOTPROGS)
clean:
$(RM) $(PROGS)
diff --git a/usr/src/lib/brand/lx/librtld_db/Makefile b/usr/src/lib/brand/lx/librtld_db/Makefile
index ce2b48a6a8..f1ac26d7d5 100644
--- a/usr/src/lib/brand/lx/librtld_db/Makefile
+++ b/usr/src/lib/brand/lx/librtld_db/Makefile
@@ -43,7 +43,7 @@ lint := TARGET= lint
.KEEP_STATE:
-all install clean clobber: $(ROOTBRANDDIR) $(ROOTBRANDDIR64) $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
lint: $(LINT_SUBDIRS)
diff --git a/usr/src/lib/brand/lx/librtld_db/amd64/Makefile b/usr/src/lib/brand/lx/librtld_db/amd64/Makefile
index 4d6f84378e..f2cbdd0616 100644
--- a/usr/src/lib/brand/lx/librtld_db/amd64/Makefile
+++ b/usr/src/lib/brand/lx/librtld_db/amd64/Makefile
@@ -35,4 +35,4 @@ include $(SRC)/lib/Makefile.lib.64
CLOBBERFILES = $(ROOTLIBDIR64)/$(DYNLIB)
-install: $(ROOTLIBDIR64) all $(ROOTLIBS64)
+install: all $(ROOTLIBS64)
diff --git a/usr/src/lib/brand/lx/librtld_db/i386/Makefile b/usr/src/lib/brand/lx/librtld_db/i386/Makefile
index b931c56348..e85d3fc08a 100644
--- a/usr/src/lib/brand/lx/librtld_db/i386/Makefile
+++ b/usr/src/lib/brand/lx/librtld_db/i386/Makefile
@@ -34,4 +34,4 @@ include ../Makefile.com
CLOBBERFILES = $(ROOTLIBDIR)/$(DYNLIB)
-install: $(ROOTLIBDIR) all $(ROOTLIBS)
+install: all $(ROOTLIBS)
diff --git a/usr/src/lib/brand/lx/lx_brand/i386/lx_handler.s b/usr/src/lib/brand/lx/lx_brand/i386/lx_handler.s
index c9b6a5a761..3252b9b3d5 100644
--- a/usr/src/lib/brand/lx/lx_brand/i386/lx_handler.s
+++ b/usr/src/lib/brand/lx/lx_brand/i386/lx_handler.s
@@ -195,7 +195,7 @@ lx_sigreturn_tolibc(uintptr_t sp)
* Switch to the Solaris libc's %gs.
*/
movl $LWPGS_SEL, %ebx
- movw %ebx, %gs
+ movw %bx, %gs
/*
* Call lx_emulate() whose only argument is a pointer to the
@@ -240,7 +240,7 @@ lx_sigreturn_tolibc(uintptr_t sp)
movl 0xc(%esp),%eax /* 2nd param is a pointer */
movw %gs,(%eax) /* use the pointer to save current gs */
movl 0x8(%esp),%eax /* first parameter is the new gs value */
- movw %eax, %gs /* switch to the new gs value */
+ movw %ax, %gs /* switch to the new gs value */
pop %eax /* restore eax */
ret
SET_SIZE(lx_swap_gs)
diff --git a/usr/src/lib/brand/lx/lx_nametoaddr/Makefile b/usr/src/lib/brand/lx/lx_nametoaddr/Makefile
index 9142ef2986..f69dcec561 100644
--- a/usr/src/lib/brand/lx/lx_nametoaddr/Makefile
+++ b/usr/src/lib/brand/lx/lx_nametoaddr/Makefile
@@ -42,7 +42,7 @@ lint := TARGET= lint
.KEEP_STATE:
-all install clean clobber: $(ROOTBRANDDIR) $(ROOTBRANDDIR64) $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
lint: $(LINT_SUBDIRS)
diff --git a/usr/src/lib/brand/lx/lx_nametoaddr/amd64/Makefile b/usr/src/lib/brand/lx/lx_nametoaddr/amd64/Makefile
index 5945014469..a526d34834 100644
--- a/usr/src/lib/brand/lx/lx_nametoaddr/amd64/Makefile
+++ b/usr/src/lib/brand/lx/lx_nametoaddr/amd64/Makefile
@@ -32,4 +32,4 @@ include $(SRC)/lib/Makefile.lib.64
DYNFLAGS += $(LX_THUNK)/$(MACH64)/lx_thunk.so.1
CLOBBERFILES = $(ROOTLIBDIR64)/$(DYNLIB) $(ROOTLIBDIR64)/$(LINTLIB)
-install: $(ROOTLIBDIR64) all $(ROOTLIBS64)
+install: all $(ROOTLIBS64)
diff --git a/usr/src/lib/brand/lx/lx_nametoaddr/i386/Makefile b/usr/src/lib/brand/lx/lx_nametoaddr/i386/Makefile
index 9dc82eb64f..67545e46cd 100644
--- a/usr/src/lib/brand/lx/lx_nametoaddr/i386/Makefile
+++ b/usr/src/lib/brand/lx/lx_nametoaddr/i386/Makefile
@@ -31,4 +31,4 @@ include ../Makefile.com
DYNFLAGS += $(LX_THUNK)/$(MACH)/lx_thunk.so.1
CLOBBERFILES = $(ROOTLIBDIR)/$(DYNLIB) $(ROOTLIBDIR)/$(LINTLIB)
-install: $(ROOTLIBDIR) all $(ROOTLIBS)
+install: all $(ROOTLIBS)
diff --git a/usr/src/lib/brand/lx/lx_support/Makefile b/usr/src/lib/brand/lx/lx_support/Makefile
index aead8b6762..c70b8d31a7 100644
--- a/usr/src/lib/brand/lx/lx_support/Makefile
+++ b/usr/src/lib/brand/lx/lx_support/Makefile
@@ -45,7 +45,7 @@ LDLIBS += -lzonecfg
.KEEP_STATE:
-install: all $(ROOTBRANDDIR) $(ROOTPROGS)
+install: all $(ROOTPROGS)
clean:
$(RM) $(PROG) $(OBJS)
diff --git a/usr/src/lib/brand/lx/lx_support/lx_support.c b/usr/src/lib/brand/lx/lx_support/lx_support.c
index 560b76a685..ab2fcdb491 100644
--- a/usr/src/lib/brand/lx/lx_support/lx_support.c
+++ b/usr/src/lib/brand/lx/lx_support/lx_support.c
@@ -54,6 +54,9 @@
#include <sys/lx_audio.h>
#include <sys/lx_brand.h>
+static void lxs_err(char *msg, ...) __NORETURN;
+static void usage(void) __NORETURN;
+
#define CP_CMD "/usr/bin/cp"
#define MOUNT_CMD "/sbin/mount"
diff --git a/usr/src/lib/brand/lx/lx_thunk/Makefile b/usr/src/lib/brand/lx/lx_thunk/Makefile
index 9142ef2986..f69dcec561 100644
--- a/usr/src/lib/brand/lx/lx_thunk/Makefile
+++ b/usr/src/lib/brand/lx/lx_thunk/Makefile
@@ -42,7 +42,7 @@ lint := TARGET= lint
.KEEP_STATE:
-all install clean clobber: $(ROOTBRANDDIR) $(ROOTBRANDDIR64) $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
lint: $(LINT_SUBDIRS)
diff --git a/usr/src/lib/brand/lx/lx_thunk/amd64/Makefile b/usr/src/lib/brand/lx/lx_thunk/amd64/Makefile
index 086a3c821a..dbb283dff1 100644
--- a/usr/src/lib/brand/lx/lx_thunk/amd64/Makefile
+++ b/usr/src/lib/brand/lx/lx_thunk/amd64/Makefile
@@ -31,4 +31,4 @@ include $(SRC)/lib/Makefile.lib.64
CLOBBERFILES = $(ROOTLIBDIR64)/$(DYNLIB) $(ROOTLIBDIR64)/$(LINTLIB)
-install: $(ROOTLIBDIR64) all $(ROOTLIBS64)
+install: all $(ROOTLIBS64)
diff --git a/usr/src/lib/brand/lx/lx_thunk/i386/Makefile b/usr/src/lib/brand/lx/lx_thunk/i386/Makefile
index 4ad13cf029..c4b6c71027 100644
--- a/usr/src/lib/brand/lx/lx_thunk/i386/Makefile
+++ b/usr/src/lib/brand/lx/lx_thunk/i386/Makefile
@@ -30,4 +30,4 @@ include ../Makefile.com
CLOBBERFILES = $(ROOTLIBDIR)/$(DYNLIB) $(ROOTLIBDIR)/$(LINTLIB)
-install: $(ROOTLIBDIR) all $(ROOTLIBS)
+install: all $(ROOTLIBS)
diff --git a/usr/src/lib/brand/lx/netfiles/Makefile b/usr/src/lib/brand/lx/netfiles/Makefile
index ea661da94b..7c442c9c57 100644
--- a/usr/src/lib/brand/lx/netfiles/Makefile
+++ b/usr/src/lib/brand/lx/netfiles/Makefile
@@ -35,7 +35,7 @@ include ../Makefile.lx
lint:
-install: $(ROOTBRANDDIR) $(ROOTTXTS)
+install: $(ROOTTXTS)
clean:
-$(RM) etc_default_nfs
diff --git a/usr/src/lib/brand/lx/zone/Makefile b/usr/src/lib/brand/lx/zone/Makefile
index 26c95d2f9b..3ee1e7a168 100644
--- a/usr/src/lib/brand/lx/zone/Makefile
+++ b/usr/src/lib/brand/lx/zone/Makefile
@@ -49,8 +49,7 @@ $(POFILE): $(POFILES)
_msg: $(MSGDOMAINPOFILE)
-install: $(PROGS) $(ROOTBRANDDIR) $(ROOTTEMPLATEDIR) $(ROOTXMLDOCS) \
- $(ROOTTEMPLATES) $(ROOTPROGS) $(SUBDIRS)
+install: $(PROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES) $(ROOTPROGS) $(SUBDIRS)
lint:
diff --git a/usr/src/lib/brand/lx/zone/distros/Makefile b/usr/src/lib/brand/lx/zone/distros/Makefile
index 9c410a6176..84b2ec0197 100644
--- a/usr/src/lib/brand/lx/zone/distros/Makefile
+++ b/usr/src/lib/brand/lx/zone/distros/Makefile
@@ -44,7 +44,7 @@ $(ROOTDISTRODIR):
$(ROOTDISTRODIR)/%: %
$(INS.file)
-install: $(ROOTDISTRODIR) $(ROOTDISTROS)
+install: $(ROOTDISTROS)
lint clean all:
diff --git a/usr/src/lib/brand/native/zone/Makefile b/usr/src/lib/brand/native/zone/Makefile
index 00e620cc8d..b60c46df66 100644
--- a/usr/src/lib/brand/native/zone/Makefile
+++ b/usr/src/lib/brand/native/zone/Makefile
@@ -47,8 +47,7 @@ _msg: $(MSGDOMAINPOFILE)
lint:
-install: $(PROGS) $(ROOTBRANDDIR) $(ROOTPROGS) $(ROOTXMLDOCS) \
- $(ROOTTEMPLATEDIR) $(ROOTTEMPLATES)
+install: $(PROGS) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
clean:
-$(RM) $(PROGS)
diff --git a/usr/src/lib/brand/sn1/zone/Makefile b/usr/src/lib/brand/sn1/zone/Makefile
index 08c0d906a5..812c88f16a 100644
--- a/usr/src/lib/brand/sn1/zone/Makefile
+++ b/usr/src/lib/brand/sn1/zone/Makefile
@@ -40,8 +40,7 @@ lint:
clean:
-$(RM) $(PROGS)
-install: $(ROOTBRANDDIR) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATEDIR) \
- $(ROOTTEMPLATES)
+install: $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
clobber:
-$(RM) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c
index ffef8ad8ed..d3a7aed7e3 100644
--- a/usr/src/lib/libzfs/common/libzfs_dataset.c
+++ b/usr/src/lib/libzfs/common/libzfs_dataset.c
@@ -2248,10 +2248,10 @@ zfs_clone(zfs_handle_t *zhp, const char *target, nvlist_t *props)
/* do the clone */
if (ZFS_IS_VOLUME(zhp)) {
zc.zc_objset_type = DMU_OST_ZVOL;
- type = ZFS_TYPE_FILESYSTEM;
+ type = ZFS_TYPE_VOLUME;
} else {
zc.zc_objset_type = DMU_OST_ZFS;
- type = ZFS_TYPE_VOLUME;
+ type = ZFS_TYPE_FILESYSTEM;
}
if (props) {
diff --git a/usr/src/uts/i86pc/ml/syscall_asm.s b/usr/src/uts/i86pc/ml/syscall_asm.s
index bc9618fcb9..530cfcaf56 100644
--- a/usr/src/uts/i86pc/ml/syscall_asm.s
+++ b/usr/src/uts/i86pc/ml/syscall_asm.s
@@ -137,7 +137,7 @@
pushl %gs /* save the user %gs */ ;\
movl $KGS_SEL, %ebx ;\
pushl %ebx /* push kernel's %gs */ ;\
- movw %ebx, %gs /* switch to the kernel's %gs */ ;\
+ movw %bx, %gs /* switch to the kernel's %gs */ ;\
movl %gs:CPU_THREAD, %ebx /* load the thread pointer */ ;\
movl T_LWP(%ebx), %ebx /* load the lwp pointer */ ;\
pushl LWP_BRAND(%ebx) /* push the lwp's brand data */ ;\
@@ -150,13 +150,13 @@
je 1f ;\
movl %ebx, 20(%esp) /* save callback to scratch */ ;\
movl 12(%esp), %ebx /* grab the the user %gs */ ;\
- movw %ebx, %gs /* restore the user %gs */ ;\
+ movw %bx, %gs /* restore the user %gs */ ;\
movl 16(%esp), %ebx /* restore %ebx */ ;\
pushl 24(%esp) /* push the return address */ ;\
call *24(%esp) /* call callback */ ;\
addl $4, %esp /* get rid of ret addr */ ;\
1: movl 12(%esp), %ebx /* grab the the user %gs */ ;\
- movw %ebx, %gs /* restore the user %gs */ ;\
+ movw %bx, %gs /* restore the user %gs */ ;\
movl 16(%esp), %ebx /* restore user's %ebx */ ;\
addl $24, %esp /* restore stack ptr */
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-19 15:16:51 +0000