summaryrefslogtreecommitdiff
path: root/usr/src/lib/libc/amd64/sys/uadmin.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/libc/amd64/sys/uadmin.c')
-rw-r--r--usr/src/lib/libc/amd64/sys/uadmin.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/usr/src/lib/libc/amd64/sys/uadmin.c b/usr/src/lib/libc/amd64/sys/uadmin.c
index f8f2c0337b..8caf6d5bc3 100644
--- a/usr/src/lib/libc/amd64/sys/uadmin.c
+++ b/usr/src/lib/libc/amd64/sys/uadmin.c
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -44,6 +45,7 @@
#include <sys/uadmin.h>
#include <unistd.h>
#include <string.h>
+#include <pthread.h>
#include <zone.h>
static int
@@ -102,6 +104,10 @@ uadmin(int cmd, int fcn, uintptr_t mdep)
if (legal_arg(bargs) < 0)
break; /* bad args */
+ /* avoid cancellation in system() */
+ (void) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE,
+ NULL);
+
/* check for /stubboot */
if (stat("/stubboot/boot/grub/menu.lst", &sbuf) == 0) {
altroot = "-R /stubboot ";