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

use inst.stage2=hd:LABEL (#848641)

Browse Source 
The iso is able to autodetect the device and find stage2, but when they
are written to USB via dd it needs to know where to find the install
media.
This commit is contained in:
Brian C. Lane 2012-08-22 16:59:03 -07:00
parent da306b6313
commit de50815e5e
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/efi.tmpl
View File

@ -40,11 +40,9 @@ ${make_efiboot("images/efiboot.img")}
replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${eficonf} replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${eficonf}
replace @ISOLABEL@ '${isolabel}' ${eficonf} replace @ISOLABEL@ '${isolabel}' ${eficonf}
%if disk: %if disk:
## FIXME: using root= causes problems with product.img (see bug 811979) replace @ROOT@ inst.stage2=hd:LABEL=ANACONDA ${eficonf}
replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf}
%else: %else:
## anaconda can find CDROM devices automatically so no root= is needed replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf}
replace @ROOT@ '' ${eficonf}
%endif %endif
%if efiarch == 'IA32': %if efiarch == 'IA32':
copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf

4
share/live/efi.tmpl
View File

@ -41,9 +41,9 @@ ${make_efiboot("images/efiboot.img")}
replace @ISOLABEL@ '${isolabel}' ${eficonf} replace @ISOLABEL@ '${isolabel}' ${eficonf}
%if disk: %if disk:
## FIXME: using root= causes problems with product.img (see bug 811979) ## FIXME: using root= causes problems with product.img (see bug 811979)
replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf} replace @ROOT@ inst.stage2:LABEL=ANACONDA ${eficonf}
%else: %else:
replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${eficonf} replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf}
%endif %endif
%if efiarch == 'IA32': %if efiarch == 'IA32':
copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf

2
share/live/sparc.tmpl
View File

@ -17,7 +17,7 @@ install ${configdir}/boot.msg ${BOOTDIR}
## configure bootloader ## configure bootloader
replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg
replace @PRODUCT@ '${product.name}' ${BOOTDIR}/boot.msg replace @PRODUCT@ '${product.name}' ${BOOTDIR}/boot.msg
replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf
## install kernels ## install kernels
## FIXME: this will overwrite if there are multiple sparc kernels ## FIXME: this will overwrite if there are multiple sparc kernels

2
share/live/x86.tmpl
View File

@ -25,7 +25,7 @@ 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 replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
## install kernels ## install kernels
mkdir ${KERNELDIR} mkdir ${KERNELDIR}

2
share/sparc.tmpl
View File

@ -17,7 +17,7 @@ install ${configdir}/boot.msg ${BOOTDIR}
## configure bootloader ## configure bootloader
replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg
replace @PRODUCT@ '${product.name}' ${BOOTDIR}/boot.msg replace @PRODUCT@ '${product.name}' ${BOOTDIR}/boot.msg
replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf
## install kernels ## install kernels
## FIXME: this will overwrite if there are multiple sparc kernels ## FIXME: this will overwrite if there are multiple sparc kernels

3
share/x86.tmpl
View File

@ -25,8 +25,7 @@ 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
## anaconda will find the CDROM automatically replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
replace @ROOT@ '' ${BOOTDIR}/isolinux.cfg
## install kernels ## install kernels
mkdir ${KERNELDIR} mkdir ${KERNELDIR}