diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2011-03-30 12:15:14 -0700 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2011-03-30 12:15:14 -0700 |
| commit | b13e1717bae197eba9a9d0fa1db9e6c411caff2b (patch) | |
| tree | 2f595818f2deeab783e273a3ff251b13a46ea537 /usr/src/cmd/halt | |
| parent | 509c07523f0c6fcbfec6a8f7d0f01228cfa6f62b (diff) | |
| download | illumos-joyent-b13e1717bae197eba9a9d0fa1db9e6c411caff2b.tar.gz | |
OS-348 reboot induces panic in cte_trim()
Diffstat (limited to 'usr/src/cmd/halt')
| -rw-r--r-- | usr/src/cmd/halt/halt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c index 528823531e..ec3a0b3a77 100644 --- a/usr/src/cmd/halt/halt.c +++ b/usr/src/cmd/halt/halt.c @@ -21,6 +21,7 @@ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2011 Joyent, Inc. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -1294,7 +1295,7 @@ main(int argc, char *argv[]) optstring = "dlnqfp"; usage = gettext("usage: %s [ -dlnq(p|f) ] [ boot args ]\n"); #endif - cmd = A_SHUTDOWN; + cmd = A_REBOOT; fcn = AD_BOOT; } else { (void) fprintf(stderr, @@ -1503,7 +1504,8 @@ main(int argc, char *argv[]) * check_zone_haltedness later on. */ if (zoneid == GLOBAL_ZONEID && cmd != A_DUMP) { - need_check_zones = halt_zones(); + if (!qflag) + need_check_zones = halt_zones(); } #if defined(__i386) @@ -1603,7 +1605,7 @@ main(int argc, char *argv[]) (void) signal(SIGINT, SIG_IGN); - if (!qflag && !nosync) { + if (!nosync) { struct utmpx wtmpx; bzero(&wtmpx, sizeof (struct utmpx)); |