almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Update ppc64le isolabel to match x86_64 logic

Browse Source 
It was substituting _ which didn't match what pungi uses for creating
the DVD. Make things consistent and use - as the replacement character.

Resolves: rhbz#1687882
(cherry picked from commit 372bef945f)
This commit is contained in:
Brian C. Lane 2019-03-13 09:06:04 -07:00
parent 379f088459
commit 176ca0a137
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
share/templates.d/99-generic/ppc64le.tmpl
View File

@ -6,11 +6,11 @@ GRUBDIR="boot/grub"
STAGE2IMG="images/install.img" STAGE2IMG="images/install.img"
LORAXDIR="usr/share/lorax/" LORAXDIR="usr/share/lorax/"
## NOTE: yaboot freaks out and stops parsing its config if it sees a '\', ## Don't allow spaces or escape characters in the iso label
## so we can't use the udev escape sequences in the root arg. def valid_label(ch):
## Instead we'll just replace any non-ASCII characters in the isolabel return ch.isalnum() or ch == '_'
## with '_', which means we won't need any udev escapes.
isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel) isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
from os.path import basename from os.path import basename
%> %>