summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2017-04-21 13:27:21 +0300
committerRobert Mustacchi <rm@joyent.com>2017-05-02 23:45:41 +0000
commita4a8e1820b3e7dcf4d8e08ffcb37b911b8ad5003 (patch)
tree96298e6ab2417654521ba480c7ad40bdb053755e
parent6ea3a31b44e53b311373bfe0ae8414d122edca27 (diff)
downloadillumos-joyent-a4a8e1820b3e7dcf4d8e08ffcb37b911b8ad5003.tar.gz
8091 gptzfboot: status does print duplicate header line
Reviewed by: Marcel Telka <marcel@telka.sk> Reviewed by: Jason King <jason.brian.king@gmail.com> Approved by: Robert Mustacchi <rm@joyent.com>
-rw-r--r--usr/src/boot/Makefile.version2
-rw-r--r--usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version
index c8dbaf6b00..132d1eb155 100644
--- a/usr/src/boot/Makefile.version
+++ b/usr/src/boot/Makefile.version
@@ -33,4 +33,4 @@ LOADER_VERSION = 1.1
# Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
# The version is processed from left to right, the version number can only
# be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2017.4.23.1
+BOOT_VERSION = $(LOADER_VERSION)-2017.4.23.2
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c b/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c
index 0ee7f2c9bb..bc1c4da24a 100644
--- a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c
+++ b/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c
@@ -508,9 +508,6 @@ parse_cmd(void)
pager_open();
for (i = 0; devsw[i] != NULL; i++) {
if (devsw[i]->dv_print != NULL) {
- sprintf(line, "\n%s devices:\n", devsw[i]->dv_name);
- if (pager_output(line))
- break;
if (devsw[i]->dv_print(1))
break;
} else {