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

live uses root not inst.stage2

Browse Source 
I changed too many templates when changing to inst.stage2, live still
obviously needs root= in order to boot.
This commit is contained in:
Brian C. Lane 2012-09-13 16:07:24 -07:00
parent 2559dc64d8
commit 26ea847e8f
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
share/live/efi.tmpl
View File

@ -40,10 +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@ root=live:LABEL=ANACONDA ${eficonf}
replace @ROOT@ inst.stage2:LABEL=ANACONDA ${eficonf}
%else: %else:
replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf} replace @ROOT@ 'root=live:CDLABEL=${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@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf replace @ROOT@ 'root=live:CDLABEL=${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@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
## install kernels ## install kernels
mkdir ${KERNELDIR} mkdir ${KERNELDIR}