summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2015-01-21 19:28:07 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2015-01-21 19:28:07 +0000
commitbd508c4581cda4e1c11ac191bb2c0c6b080308fc (patch)
treee4cd8cd87ea1e2919074ee95fe2c296bd66d7387 /usr/src
parentcc26e14e3ce92f68b1b3936bb0353c03610ce401 (diff)
downloadillumos-joyent-bd508c4581cda4e1c11ac191bb2c0c6b080308fc.tar.gz
OS-3736 When restart_init is false, it's possible for init to exit and zone continues running with no processes
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/os/exit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/uts/common/os/exit.c b/usr/src/uts/common/os/exit.c
index de60916e3d..6a27544201 100644
--- a/usr/src/uts/common/os/exit.c
+++ b/usr/src/uts/common/os/exit.c
@@ -21,7 +21,7 @@
/*
* Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2014 Joyent, Inc. All rights reserved.
+ * Copyright 2015 Joyent, Inc. All rights reserved.
*/
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
@@ -406,7 +406,8 @@ proc_exit(int why, int what)
}
z->zone_init_status = wstat(why, what);
- (void) zone_kadmin(A_SHUTDOWN, AD_HALT, NULL, CRED());
+ (void) zone_kadmin(A_SHUTDOWN, AD_HALT, NULL,
+ zone_kcred());
}
/*