diff options
| author | Konstantin Ananyev <Konstantin.Ananyev@Sun.COM> | 2008-10-07 15:41:56 -0700 |
|---|---|---|
| committer | Konstantin Ananyev <Konstantin.Ananyev@Sun.COM> | 2008-10-07 15:41:56 -0700 |
| commit | 8e07a41f6fae3d5b0619bd9c6f9fd19f97ad2c80 (patch) | |
| tree | 8b387349a597769cfc9ef2ba4985f203e0debd2b /usr/src/cmd/halt | |
| parent | ba7962c0250fa58d6c360c01c4866d394aae57b8 (diff) | |
| download | illumos-joyent-8e07a41f6fae3d5b0619bd9c6f9fd19f97ad2c80.tar.gz | |
6756293 poweroff and halt commands broken by fast reboot feature
6756300 Fast reboot from an unmounted ufs root file system fails with errno EFBIG
Diffstat (limited to 'usr/src/cmd/halt')
| -rw-r--r-- | usr/src/cmd/halt/halt.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c index fd603605f9..2bcb67cf46 100644 --- a/usr/src/cmd/halt/halt.c +++ b/usr/src/cmd/halt/halt.c @@ -34,6 +34,7 @@ * University Acknowledgment- Portions of this document are derived from * software developed by the University of California, Berkeley, and its * contributors. + * Portions contributed by Juergen Keil, <jk@tools.de>. */ @@ -52,6 +53,7 @@ #include <sys/mntent.h> #include <sys/mnttab.h> #include <sys/mount.h> +#include <sys/fs/ufs_mount.h> #include <alloca.h> #include <assert.h> #include <errno.h> @@ -595,11 +597,14 @@ validate_disk(char *arg, char *mountpoint) static int validate_ufs_disk(char *arg, char *mountpoint) { - char mntopts[MNT_LINE_MAX] = { '\0' }; + struct ufs_args ufs_args = { 0 }; + char mntopts[MNT_LINE_MAX] = MNTOPT_LARGEFILES; /* perform the mount */ + ufs_args.flags = UFSMNT_LARGEFILES; if (mount(arg, mountpoint, MS_DATA|MS_OPTIONSTR, - MNTTYPE_UFS, NULL, 0, mntopts, sizeof (mntopts)) != 0) { + MNTTYPE_UFS, &ufs_args, sizeof (ufs_args), + mntopts, sizeof (mntopts)) != 0) { perror(cmdname); (void) fprintf(stderr, gettext("%s: failed to mount %s\n"), cmdname, arg); @@ -1134,6 +1139,7 @@ main(int argc, char *argv[]) uintptr_t mdep = NULL; int cmd, fcn, c, aval, r; const char *usage; + const char *optstring; zoneid_t zoneid = getzoneid(); int need_check_zones = 0; char bootargs_buf[BOOTARGS_MAX]; @@ -1149,19 +1155,23 @@ main(int argc, char *argv[]) if (strcmp(cmdname, "halt") == 0) { (void) audit_halt_setup(argc, argv); + optstring = "dlnqy"; usage = gettext("usage: %s [ -dlnqy ]\n"); cmd = A_SHUTDOWN; fcn = AD_HALT; } else if (strcmp(cmdname, "poweroff") == 0) { (void) audit_halt_setup(argc, argv); + optstring = "dlnqy"; usage = gettext("usage: %s [ -dlnqy ]\n"); cmd = A_SHUTDOWN; fcn = AD_POWEROFF; } else if (strcmp(cmdname, "reboot") == 0) { (void) audit_reboot_setup(); #if defined(__i386) + optstring = "dlnqfe:"; usage = gettext("usage: %s [ -dlnqfe: ] [ boot args ]\n"); #else + optstring = "dlnq"; usage = gettext("usage: %s [ -dlnq ] [ boot args ]\n"); #endif cmd = A_SHUTDOWN; @@ -1172,7 +1182,7 @@ main(int argc, char *argv[]) return (1); } - while ((c = getopt(argc, argv, "dlnqyfe:")) != EOF) { + while ((c = getopt(argc, argv, optstring)) != EOF) { switch (c) { case 'd': if (zoneid == GLOBAL_ZONEID) @@ -1249,7 +1259,7 @@ main(int argc, char *argv[]) /* * Check whether fast reboot is the default operating mode */ - if (!fast_reboot) + if (fcn == AD_BOOT && !fast_reboot) fast_reboot = is_fastboot_default(euid); if (bename && !fast_reboot) { |