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

Don't set a root= argument (#837208)

Browse Source 
Using root= overrides the anaconda magic code for finding product.img
and updates.img. Anaconda can find the CDROM itself without needing
root=, though, so we can omit it safely for boot.iso.
This commit is contained in:
Will Woods 2012-07-10 01:34:06 -04:00 committed by Martin Gracik
parent 4715134502
commit 5437557846
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
share/efi.tmpl
View File

@ -35,10 +35,11 @@ ${make_efiboot("images/efiboot.img")}
replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf} replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf}
replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${eficonf} replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${eficonf}
%if disk: %if disk:
## FIXME: using root= causes problems with product.img (see bug 811979)
replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf} replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf}
%else: %else:
## NOTE: this needs to match the boot.iso label (see x86.tmpl) ## anaconda can find CDROM devices automatically so no root= is needed
replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${eficonf} replace @ROOT@ '' ${eficonf}
%endif %endif
%if efiarch == 'IA32': %if efiarch == 'IA32':
copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf

3
share/ppc.tmpl
View File

@ -18,7 +18,8 @@ prepboot = ""
## with '_', which means we won't need any udev escapes. ## with '_', which means we won't need any udev escapes.
isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel) isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel)
rootarg = "root=live:CDLABEL=%s" % isolabel ## Anaconda finds the CDROM device automatically
rootarg = ""
%> %>
mkdir ${LIVEDIR} mkdir ${LIVEDIR}

3
share/x86.tmpl
View File

@ -25,7 +25,8 @@ install boot/memtest* ${BOOTDIR}/memtest
## configure bootloader ## configure bootloader
replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg ## anaconda will find the CDROM automatically
replace @ROOT@ '' ${BOOTDIR}/isolinux.cfg
## install kernels ## install kernels
mkdir ${KERNELDIR} mkdir ${KERNELDIR}