From 68d9b8b1f5aa44d10783bad91775808e087ae169 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 13 Mar 2019 09:06:04 -0700 Subject: [PATCH] Update ppc64le isolabel to match x86_64 logic It was substituting _ which didn't match what pungi uses for creating the DVD. Make things consistent and use - as the replacement character. (cherry picked from commit 372bef945f2addbf66c35bce8439f3508ee2ab8a) Related: rhbz#1757338 --- share/templates.d/99-generic/ppc64le.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/templates.d/99-generic/ppc64le.tmpl b/share/templates.d/99-generic/ppc64le.tmpl index aeff30eb..0c2c0d11 100644 --- a/share/templates.d/99-generic/ppc64le.tmpl +++ b/share/templates.d/99-generic/ppc64le.tmpl @@ -6,11 +6,11 @@ GRUBDIR="boot/grub" STAGE2IMG="images/install.img" LORAXDIR="usr/share/lorax/" -## 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) +## 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) from os.path import basename %>