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

Update PPC isolabel to allow escaping spaces

Browse Source 
Escaped spaces is supported, so remove the extra filtering of the
isolabel on PPC so that it uses the same form as the other arches.

eg. inst.stage2=hd:LABEL=RHEL-7.7\x20Server.ppc64le for an iso with a
label of 'RHEL-7.7 Server.ppc64le'

Resolves: rhbz#1402328
This commit is contained in:
Brian C. Lane 2019-04-29 08:57:25 -07:00
parent d2bf2edad2
commit f5b781a9e6
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/live/ppc.tmpl
View File

@ -12,12 +12,6 @@ WRAPPER="usr/sbin/wrapper"
WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper" WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper"
prepboot = "" prepboot = ""
## NOTE: yaboot freaks out and stops parsing its config if it sees a '\',
## so we can't use the udev escape sequences in the root arg.
## Instead we'll just replace any non-ASCII characters in the isolabel
## with '_', which means we won't need any udev escapes.
isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel)
%> %>
mkdir ${LIVEDIR} mkdir ${LIVEDIR}

6
share/ppc.tmpl
View File

@ -12,12 +12,6 @@ WRAPPER="usr/sbin/wrapper"
WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper" WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper"
prepboot = "" prepboot = ""
## Don't allow spaces or escape characters in the iso label
def valid_label(ch):
return ch.isalnum() or ch == '_'
isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
%> %>
mkdir ${LIVEDIR} mkdir ${LIVEDIR}