diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2011-04-06 10:14:53 -0700 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2011-04-06 10:14:53 -0700 |
| commit | 1ff7681e57e07acd195f060ea2dc4517bf223e87 (patch) | |
| tree | 431e2e769bdf526e9d9ae27d0455c5c051735019 /usr/src/cmd/halt | |
| parent | bce78673806cf11b015a8bd0a3cef7aab3d0bc79 (diff) | |
| download | illumos-joyent-1ff7681e57e07acd195f060ea2dc4517bf223e87.tar.gz | |
OS-349 warnings about grub while rebooting the headnode
Diffstat (limited to 'usr/src/cmd/halt')
| -rw-r--r-- | usr/src/cmd/halt/halt.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c index ec3a0b3a77..9a4e113936 100644 --- a/usr/src/cmd/halt/halt.c +++ b/usr/src/cmd/halt/halt.c @@ -1229,6 +1229,17 @@ do_archives_update(int do_fast_reboot) pid_t pid; char *cmd_argv[MAXARGS]; +#if defined(__i386) + { + /* + * bootadm will complain and exit if not a grub root, so + * just skip running it. + */ + struct stat sb; + if (stat("/boot/grub/stage2", &sb) == -1) + return; + } +#endif /* __i386 */ cmd_argv[i++] = "/sbin/bootadm"; cmd_argv[i++] = "-ea"; |