Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
zipl: remove trailing spaces from the fields defined in BLS files
Currently the zipl tool doesn't remove trailing spaces from the BLS field
values. So for example if a 'title' field has trailing spaces and is used
as the default, zipl will complain that there's no section with that name:

Using config file '/etc/zipl.conf'
Using BLS config file '/boot/loader/entries/f871a0cf218348c5ba921f61c92b7eac-4.18.0-80.20.el8.s390x.conf'
Using BLS config file '/boot/loader/entries/f871a0cf218348c5ba921f61c92b7eac-0-rescue.conf'
Error: Config file '/etc/zipl.conf': Line 6: no such section 'Red Hat Enterprise Linux (4.18.0-80.20.el8.s390x) 8.1 (Ootpa)'

Since the trailing spaces are also removed from the fields defined in the
zipl.conf file, do the same for the ones that are defined in the BLS file.

Closes: #62
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Acked-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
  • Loading branch information
martinezjavier authored and hoeppnerj committed Jul 18, 2019
1 parent d4ea321 commit 53f1666
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions zipl/src/scan.c
Expand Up @@ -699,6 +699,10 @@ scan_bls_field(struct misc_file_buffer *file, struct scan_token* scan,
}

val_end = file->pos;

while (val_end > val_start && isblank(file->buffer[val_end - 1]))
val_end--;

file->buffer[key_end] = '\0';
file->buffer[val_end] = '\0';

Expand Down Expand Up @@ -780,6 +784,7 @@ scan_bls(const char* blsdir, struct scan_token** token, int scan_size)
case EOF:
break;
case '\t':
case '\n':
case '\0':
case ' ':
file.pos++;
Expand Down

0 comments on commit 53f1666

Please sign in to comment.