diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2019-10-04 15:57:30 +0000 |
|---|---|---|
| committer | Andy Fiddaman <omnios@citrus-it.co.uk> | 2019-10-11 21:19:23 +0000 |
| commit | e39d848858aa235e4715efe1293ed57ddb0231c5 (patch) | |
| tree | c3ec2f852189fa9af6c5957bcf68ae269ec5ba57 /usr/src/cmd/boot | |
| parent | 00a2bb8f2626ebdf8b00480ccc705df3502feab1 (diff) | |
| download | illumos-gate-e39d848858aa235e4715efe1293ed57ddb0231c5.tar.gz | |
11782 reboot -f ends up creating bad /boot/transient.conf
11783 Print a message when rebooting due to a stale boot archive
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Dominik Hassler <hadfl@omniosce.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/boot')
| -rw-r--r-- | usr/src/cmd/boot/bootadm/bootadm_loader.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/cmd/boot/bootadm/bootadm_loader.c b/usr/src/cmd/boot/bootadm/bootadm_loader.c index 1e41533df2..5755efd7d5 100644 --- a/usr/src/cmd/boot/bootadm/bootadm_loader.c +++ b/usr/src/cmd/boot/bootadm/bootadm_loader.c @@ -26,7 +26,7 @@ /* * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright 2016 Toomas Soome <tsoome@me.com> - * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. + * Copyright 2019 OmniOS Community Edition (OmniOSce) Association. */ /* @@ -1136,9 +1136,9 @@ update_temp(struct menu_lst *menu, char *dummy, char *opt) if (env != NULL) { env = getenv("boot-args"); - (void) fprintf(fp, "boot-args=\"%s %s\"\n", env, opt); + (void) fprintf(fp, "boot-args='%s %s'\n", env, opt); } else - (void) fprintf(fp, "boot-args=\"%s\"\n", opt); + (void) fprintf(fp, "boot-args='%s'\n", opt); (void) fclose(fp); return (BAM_SUCCESS); } @@ -1155,7 +1155,7 @@ update_temp(struct menu_lst *menu, char *dummy, char *opt) fp = fopen(path, "w"); if (fp == NULL) return (BAM_ERROR); - (void) fprintf(fp, "bootfile=\"%s;unix\"\n", opt); + (void) fprintf(fp, "bootfile='%s;unix'\n", opt); (void) fclose(fp); return (BAM_SUCCESS); } @@ -1163,13 +1163,13 @@ update_temp(struct menu_lst *menu, char *dummy, char *opt) fp = fopen(path, "w"); if (fp == NULL) return (BAM_ERROR); - (void) fprintf(fp, "bootfile=\"%s;unix\"\n", opt); + (void) fprintf(fp, "bootfile='%s;unix'\n", opt); if (env != NULL) { env = getenv("boot-args"); - (void) fprintf(fp, "boot-args=\"%s %s\"\n", env, opt); + (void) fprintf(fp, "boot-args='%s %s'\n", env, o); } else - (void) fprintf(fp, "boot-args=\"%s\"\n", o); + (void) fprintf(fp, "boot-args='%s'\n", o); (void) fflush(fp); (void) fclose(fp); |