summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/sys
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2014-07-28 05:15:24 +0000
committerRobert Mustacchi <rm@joyent.com>2014-07-30 10:12:47 +0000
commit29e61af1e4197a2257d9f07c6ea4da563d19856a (patch)
tree890a31a717d54243d68553828cb3011b24f4b6b7 /usr/src/uts/common/sys
parent773ec6987ca1e06d93c1cadbada051c3be95aaed (diff)
downloadillumos-joyent-29e61af1e4197a2257d9f07c6ea4da563d19856a.tar.gz
OS-3280 need a way to specify the root of a native system in the lx brand
OS-3279 lx brand should allow delegated datasets Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Diffstat (limited to 'usr/src/uts/common/sys')
-rw-r--r--usr/src/uts/common/sys/auxv.h1
-rw-r--r--usr/src/uts/common/sys/brand.h1
-rw-r--r--usr/src/uts/common/sys/exec.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/uts/common/sys/auxv.h b/usr/src/uts/common/sys/auxv.h
index d0b83e10c8..b7db2c6454 100644
--- a/usr/src/uts/common/sys/auxv.h
+++ b/usr/src/uts/common/sys/auxv.h
@@ -201,6 +201,7 @@ extern uint_t getisax(uint32_t *, uint_t);
#define AT_SUN_BRAND_AUX1 2020
#define AT_SUN_BRAND_AUX2 2021
#define AT_SUN_BRAND_AUX3 2022
+#define AT_SUN_BRAND_NROOT 2024
/*
* Note that 2023 is reserved for the AT_SUN_HWCAP2 word defined above.
diff --git a/usr/src/uts/common/sys/brand.h b/usr/src/uts/common/sys/brand.h
index dfbbd870db..9436c4e145 100644
--- a/usr/src/uts/common/sys/brand.h
+++ b/usr/src/uts/common/sys/brand.h
@@ -128,6 +128,7 @@ struct brand_ops {
int b_nsig;
void (*b_exit_with_sig)(proc_t *, sigqueue_t *, void *);
boolean_t (*b_wait_filter)(proc_t *, proc_t *);
+ boolean_t (*b_native_exec)(uint8_t, const char **);
};
/*
diff --git a/usr/src/uts/common/sys/exec.h b/usr/src/uts/common/sys/exec.h
index 85808e1834..8509d51a9f 100644
--- a/usr/src/uts/common/sys/exec.h
+++ b/usr/src/uts/common/sys/exec.h
@@ -106,6 +106,7 @@ typedef struct uarg {
vnode_t *ex_vp;
char *emulator;
char *brandname;
+ const char *brand_nroot;
char *auxp_auxflags; /* addr of auxflags auxv on the user stack */
char *auxp_brand; /* address of first brand auxv on user stack */
cred_t *pfcred;