diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-19 12:07:49 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-19 12:07:49 +0000 |
| commit | 3817aef5460600089dfc2425a47c170ab4cce9e4 (patch) | |
| tree | 73c5ac47d6ca43c532100c0f5e2d8e58f7f19728 /usr/src/cmd/boot/bootadm/bootadm_loader.c | |
| parent | b0c683a03f7c07cd7ab962acc1dcfef6ba4f78a3 (diff) | |
| parent | d5b4c61b9474779079c9ef8650d04dd7c8207a06 (diff) | |
| download | illumos-joyent-release-20200521.tar.gz | |
[illumos-gate merge]release-20200521
commit d5b4c61b9474779079c9ef8650d04dd7c8207a06
12732 Update Intel microcode to 20200508
commit c61a1653a4d73dbc950dac7d96350fd6cb517486
12676 want better offloads for vnics
12677 simnet has bogus mi_tx_cksum_flags
12678 mac_tx() is too eager to emulate hardware offloads
commit f13f199891d2a0440db0361743dd73527f565e89
12729 bootadm set-menu timeout crashes without timeout value
commit c039d8138bcc82c8082abc5560e0293afb7994cf
12741 Fix "more then" typo in dlopen(3c)
commit 109b65249647da8f2f4306cd9b3d2800b05fd59b
12744 gfx_private: bitmap_cons_clear 8-bit mode is using wrong color
commit 3382f241dd77fdfc4a9c4b03092e328924cd0c65
12707 Port OpenZFS Coverity Fixes
commit 0c268761780011e1de45099cf76b2ee464ea8f50
12733 loader: autoboot_timeout greater than 10 is not shown
Conflicts:
usr/src/boot/sys/boot/forth/menu.4th
usr/src/pkg/manifests/system-test-nettest.mf
usr/src/test/net-tests/config/Makefile
usr/src/test/net-tests/runfiles/default.run
usr/src/test/net-tests/tests/forwarding/README
usr/src/test/net-tests/tests/forwarding/ip_forwarding.ksh
usr/src/test/net-tests/tests/net_common.ksh
usr/src/uts/common/io/mac/mac.c
usr/src/uts/common/io/mac/mac_client.c
usr/src/uts/common/io/mac/mac_sched.c
usr/src/uts/common/io/mac/mac_util.c
usr/src/uts/common/io/simnet/simnet.c
Diffstat (limited to 'usr/src/cmd/boot/bootadm/bootadm_loader.c')
| -rw-r--r-- | usr/src/cmd/boot/bootadm/bootadm_loader.c | 4 |
1 files changed, 4 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) { |