diff --git a/s390-tools-zipl-title-section-name.patch b/s390-tools-zipl-title-section-name.patch deleted file mode 100644 index d6ed801..0000000 --- a/s390-tools-zipl-title-section-name.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- /dev/null -+++ b/s390-tools-zipl-title-section-name.patch -@@ -0,0 +1,50 @@ -+From ce171812a829d6e0fe1c7d1f91d2ddd301f03bec Mon Sep 17 00:00:00 2001 -+From: Javier Martinez Canillas -+Date: Tue, 6 Nov 2018 13:29:32 +0100 -+Subject: [PATCH] zipl: use the BLS "title" field as the IPL section name -+ -+Most bootloaders use the BootLoaderSpec "title" field to name the entries -+in their boot menu. The zipl bootloader used the "version" field instead, -+since it was wrongly assumed that the zipl boot menu didn't support names -+that contained spaces, which are usually present in a BLS "title" field. -+ -+But this is not the case, names with space characters are supported by the -+IPL and is just a constraint of the section heading in the zipl.conf file. -+ -+So to be consistent with all the other bootloaders, use the "title" field -+also on zipl when populating the boot menu entries from BLS files. -+ -+Signed-off-by: Javier Martinez Canillas -+--- -+ scripts/zipl-switch-to-blscfg | 1 + -+ zipl/src/scan.c | 2 +- -+ 2 files changed, 2 insertions(+), 1 deletion(-) -+ -+diff --git a/scripts/zipl-switch-to-blscfg b/scripts/zipl-switch-to-blscfg -+index 5272033e9848..5141b1c0dd6d 100755 -+--- a/scripts/zipl-switch-to-blscfg -++++ b/scripts/zipl-switch-to-blscfg -+@@ -150,6 +150,7 @@ while IFS='= ' read key val; do -+ if [ -f "${OUTPUT}" ]; then -+ print_error "BLS file ${OUTPUT} already exists" -+ fi -++ echo "title $section" >> ${OUTPUT} -+ fi -+ elif [[ $val ]]; then -+ val="$(echo $val | sed -e 's/^[ \t"]*//;s/[ \t"]*$//')" -+diff --git a/zipl/src/scan.c b/zipl/src/scan.c -+index fe72e9ab13df..9160d083e5cb 100644 -+--- a/zipl/src/scan.c -++++ b/zipl/src/scan.c -+@@ -701,7 +701,7 @@ scan_bls_field(struct misc_file_buffer *file, struct scan_token* scan, -+ file->buffer[key_end] = '\0'; -+ file->buffer[val_end] = '\0'; -+ -+- if (strncmp("version", &file->buffer[key_start], key_end - key_start) == 0) { -++ if (strncmp("title", &file->buffer[key_start], key_end - key_start) == 0) { -+ scan_append_section_heading(scan, index, &file->buffer[val_start]); -+ } -+ -+-- -+2.19.1 -+ diff --git a/s390utils.spec b/s390utils.spec index f06a221..acd6430 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -30,8 +30,6 @@ Source24: 91-zipl.install # change the defaults to match Fedora environment Patch0: s390-tools-zipl-invert-script-options.patch Patch3: s390-tools-zipl-blscfg-rpm-nvr-sort.patch -# https://github.com/ibm-s390-tools/s390-tools/pull/47 -Patch5: s390-tools-zipl-title-section-name.patch Requires: s390utils-base = %{epoch}:%{version}-%{release} Requires: s390utils-osasnmpd = %{epoch}:%{version}-%{release} @@ -56,7 +54,6 @@ be used together with the zSeries (s390) Linux kernel and device drivers. # Fedora/RHEL changes %patch0 -p1 -b .zipl-invert-script-options %patch3 -p1 -b .blscfg-rpm-nvr-sort -%patch5 -p1 -b .zipl-title-section-name.patch # remove --strip from install