diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-03 12:58:04 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-03 12:58:04 +0000 |
| commit | b69deb59db49c8958cbaea43a0d6bf9029f5b19e (patch) | |
| tree | 4961beb6bfb113069d54b6dfb460e9b51bf0a0a9 /usr/src/cmd/halt | |
| parent | f0dcd619b1421138ac11033df8e0cf904ba1efcf (diff) | |
| parent | 8a2b682e57a046b828f37bcde1776f131ef4629f (diff) | |
| download | illumos-joyent-b69deb59db49c8958cbaea43a0d6bf9029f5b19e.tar.gz | |
[illumos-gate merge]
commit 8a2b682e57a046b828f37bcde1776f131ef4629f
12206 Want datalink properties in topo
commit 1b500975aaacf8b5d0e18c9a117bf5560069ffc3
4454 ldi notifications trigger vdev_disk_free() without spa_config_lock()
commit 4e995f2a014b6efa1fa6b0cf17c7f63ed51acf69
12256 reboot(1m) looks for 32-bit kernel only
Diffstat (limited to 'usr/src/cmd/halt')
| -rw-r--r-- | usr/src/cmd/halt/halt.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c index 0f096c6638..ca0ed8e77f 100644 --- a/usr/src/cmd/halt/halt.c +++ b/usr/src/cmd/halt/halt.c @@ -646,6 +646,19 @@ validate_disk(char *arg, char *mountpoint) if (rc != 0) return (rc); + /* + * Check for the usual case: 64-bit kernel + */ + (void) snprintf(kernpath, MAXPATHLEN, + "%s/platform/i86pc/kernel/amd64/unix", mountpoint); + if (stat64(kernpath, &statbuf) == 0) + return (0); + + /* + * We no longer build 32-bit kernel but in a case we are trying to boot + * some ancient filesystem with 32-bit only kernel we should be able to + * proceed too + */ (void) snprintf(kernpath, MAXPATHLEN, "%s/platform/i86pc/kernel/unix", mountpoint); @@ -1151,7 +1164,7 @@ parse_fastboot_args(char *bootargs_buf, size_t buf_size, } else if (mplen != 0) { /* * No unix argument, but mountpoint is not empty, use - * /platform/i86pc/$ISADIR/kernel/unix as default. + * /platform/i86pc/kernel/$ISADIR/unix as default. */ char isa[20]; |