diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2018-08-29 14:58:43 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2018-09-21 15:12:28 +0000 |
| commit | 75383e32bbd38e24115eefe5dee272d42a5c723e (patch) | |
| tree | b86871b136837439650d0b884cc51877cb245312 /usr/src/cmd/halt | |
| parent | c057d312c6f715bb3aeadb653466e7046f26c4af (diff) | |
| download | illumos-joyent-75383e32bbd38e24115eefe5dee272d42a5c723e.tar.gz | |
9627 No longer need 32-bit boot_archive
9628 UFS boot archives are too large
9721 cmd/boot: support cpio boot archive
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/cmd/halt')
| -rw-r--r-- | usr/src/cmd/halt/halt.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c index 166e5a163b..a98360d6c2 100644 --- a/usr/src/cmd/halt/halt.c +++ b/usr/src/cmd/halt/halt.c @@ -19,13 +19,14 @@ * CDDL HEADER END */ /* - * Copyright 2016 Toomas Soome <tsoome@me.com> * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* * Copyright (c) 2013, Joyent, Inc. All rights reserved. * Copyright (c) 2015 by Delphix. All rights reserved. + * Copyright 2016 Toomas Soome <tsoome@me.com> + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -1582,18 +1583,10 @@ main(int argc, char *argv[]) * handle a SIGTERM and clean up properly. */ if (cmd != A_DUMP) { - int start, end, delta; - - (void) kill(-1, SIGTERM); - start = time(NULL); - if (zoneid == GLOBAL_ZONEID && !nosync) do_archives_update(fast_reboot); - - end = time(NULL); - delta = end - start; - if (delta < 5) - (void) sleep(5 - delta); + (void) kill(-1, SIGTERM); + (void) sleep(5); } (void) signal(SIGINT, SIG_IGN); |