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

Use hd:LABEL= for inst.stage2 on ppc

Browse Source 
This allows USB drives to boot as well as the iso.  Also switch the
isolabel to follow the x86 format and use '-' instead of '_'.

Based on upstream commits:
c53de4e63c
372bef945f

Resolves: rhbz#1402328
This commit is contained in:
Brian C. Lane 2019-03-26 11:23:40 -07:00
parent 1f89fdbfe3
commit 7c1f29af5a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
share/ppc.tmpl
View File

@ -13,14 +13,11 @@ WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper"
prepboot = "" prepboot = ""
## 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)
## Anaconda finds the CDROM device automatically isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
rootarg = ""
%> %>
mkdir ${LIVEDIR} mkdir ${LIVEDIR}
@ -48,7 +45,7 @@ install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275
install ${configdir}/grub.cfg.in ${GRUBDIR}/grub.cfg install ${configdir}/grub.cfg.in ${GRUBDIR}/grub.cfg
replace @PRODUCT@ '${product.name}' ${GRUBDIR}/grub.cfg replace @PRODUCT@ '${product.name}' ${GRUBDIR}/grub.cfg
replace @VERSION@ ${product.version} ${GRUBDIR}/grub.cfg replace @VERSION@ ${product.version} ${GRUBDIR}/grub.cfg
replace @ROOT@ "${rootarg}" ${GRUBDIR}/grub.cfg replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUBDIR}/grub.cfg
## copy mapping and magic files needed for isos ## copy mapping and magic files needed for isos
install ${configdir}/mapping ${BOOTDIR} install ${configdir}/mapping ${BOOTDIR}