diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/cmd/boot | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/cmd/boot')
| -rw-r--r-- | usr/src/cmd/boot/bootadm/bootadm_loader.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/boot/filelist/i386/filelist.ramdisk | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/usr/src/cmd/boot/bootadm/bootadm_loader.c b/usr/src/cmd/boot/bootadm/bootadm_loader.c index 5755efd7d5..15bf160745 100644 --- a/usr/src/cmd/boot/bootadm/bootadm_loader.c +++ b/usr/src/cmd/boot/bootadm/bootadm_loader.c @@ -27,6 +27,7 @@ * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright 2016 Toomas Soome <tsoome@me.com> * Copyright 2019 OmniOS Community Edition (OmniOSce) Association. + * Copyright 2020 2020 Data Direct Networks. */ /* @@ -616,6 +617,9 @@ set_option(struct menu_lst *menu, char *dummy, char *opt) val = strchr(opt, '='); if (val != NULL) { *val++ = '\0'; + } else { + bam_error(_("missing value in key=value\n")); + return (BAM_ERROR); } if (strcmp(opt, "default") == 0) { diff --git a/usr/src/cmd/boot/filelist/i386/filelist.ramdisk b/usr/src/cmd/boot/filelist/i386/filelist.ramdisk index 387411504e..53d3936483 100644 --- a/usr/src/cmd/boot/filelist/i386/filelist.ramdisk +++ b/usr/src/cmd/boot/filelist/i386/filelist.ramdisk @@ -14,6 +14,7 @@ etc/mach etc/name_to_major etc/name_to_sysnum etc/path_to_inst +etc/ppt_aliases etc/rtc_config etc/system etc/system.d |