Don't emit media labels with spaces in them.
Spaces cause various bugs like #923374 and #855849 , and it would be better if we just didn't use them. Note that there's a corresponding pungi change to go with this. Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
parent
984ebfbef3
commit
c789f20b66
@ -6,6 +6,9 @@ PXEBOOTDIR="images/pxeboot"
|
|||||||
BOOTDIR="isolinux"
|
BOOTDIR="isolinux"
|
||||||
KERNELDIR=PXEBOOTDIR
|
KERNELDIR=PXEBOOTDIR
|
||||||
LIVEDIR="LiveOS"
|
LIVEDIR="LiveOS"
|
||||||
|
|
||||||
|
## Don't allow spaces or escape characters in the iso label
|
||||||
|
isolabel = ''.join(ch if ch.isalnum() else '-' for ch in isolabel)
|
||||||
%>
|
%>
|
||||||
|
|
||||||
mkdir ${LIVEDIR}
|
mkdir ${LIVEDIR}
|
||||||
|
@ -6,6 +6,9 @@ PXEBOOTDIR="images/pxeboot"
|
|||||||
BOOTDIR="isolinux"
|
BOOTDIR="isolinux"
|
||||||
KERNELDIR=PXEBOOTDIR
|
KERNELDIR=PXEBOOTDIR
|
||||||
LIVEDIR="LiveOS"
|
LIVEDIR="LiveOS"
|
||||||
|
|
||||||
|
## Don't allow spaces or escape characters in the iso label
|
||||||
|
isolabel = ''.join(ch if ch.isalnum() else '-' for ch in isolabel)
|
||||||
%>
|
%>
|
||||||
|
|
||||||
mkdir ${LIVEDIR}
|
mkdir ${LIVEDIR}
|
||||||
|
@ -242,7 +242,7 @@ class Lorax(BaseLoraxClass):
|
|||||||
|
|
||||||
# NOTE: if you change isolabel, you need to change pungi to match, or
|
# NOTE: if you change isolabel, you need to change pungi to match, or
|
||||||
# the pungi images won't boot.
|
# the pungi images won't boot.
|
||||||
isolabel = volid or "{0.name} {0.version} {1.basearch}".format(self.product,
|
isolabel = volid or "{0.name}-{0.version}-{1.basearch}".format(self.product,
|
||||||
self.arch)
|
self.arch)
|
||||||
|
|
||||||
if len(isolabel) > 32:
|
if len(isolabel) > 32:
|
||||||
|
@ -557,7 +557,7 @@ def make_livecd(opts, mount_dir, work_dir):
|
|||||||
remove(fullpath)
|
remove(fullpath)
|
||||||
shutil.copytree(configdir, fullpath)
|
shutil.copytree(configdir, fullpath)
|
||||||
|
|
||||||
isolabel = opts.volid or "{0.name} {0.version} {1.basearch}".format(product, arch)
|
isolabel = opts.volid or "{0.name}-{0.version}-{1.basearch}".format(product, arch)
|
||||||
if len(isolabel) > 32:
|
if len(isolabel) > 32:
|
||||||
isolabel = isolabel[:32]
|
isolabel = isolabel[:32]
|
||||||
log.warn("Truncating isolabel to 32 chars: %s", isolabel)
|
log.warn("Truncating isolabel to 32 chars: %s", isolabel)
|
||||||
|
Loading…
Reference in New Issue
Block a user