From f5b781a9e603723f74f3f6871899b596f5b4a034 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 29 Apr 2019 08:57:25 -0700 Subject: [PATCH] Update PPC isolabel to allow escaping spaces 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 --- share/live/ppc.tmpl | 6 ------ share/ppc.tmpl | 6 ------ 2 files changed, 12 deletions(-) diff --git a/share/live/ppc.tmpl b/share/live/ppc.tmpl index 5590fb45..b2470aaa 100644 --- a/share/live/ppc.tmpl +++ b/share/live/ppc.tmpl @@ -12,12 +12,6 @@ WRAPPER="usr/sbin/wrapper" WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper" 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} diff --git a/share/ppc.tmpl b/share/ppc.tmpl index 26277432..7bbe1bc4 100644 --- a/share/ppc.tmpl +++ b/share/ppc.tmpl @@ -12,12 +12,6 @@ WRAPPER="usr/sbin/wrapper" WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper" 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}