QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lorax: select xen.cfg section to enable/disable media check

Browse Source 
Apparently all but first parameters are passed to xen.efi, so it is possible to
select which config section should be used. This makes xen.efi copy
unnecessary.
This commit is contained in:
Marek Marczykowski-Górecki 2015-09-14 01:06:24 +02:00
parent 49b3630362
commit c4b965ed88
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lorax-templates-qubes/templates/config_files/x86/grub2-efi.cfg
View File

@ -21,7 +21,7 @@ set timeout=5
search --no-floppy --set=root -l '@ISOLABEL@' search --no-floppy --set=root -l '@ISOLABEL@'
menuentry 'Test media and install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { menuentry 'Test media and install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
chainloader @EFIDIR@/xen-check.efi chainloader @EFIDIR@/xen.efi placeholder qubes-check
} }
menuentry 'Install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { menuentry 'Install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {

7
lorax-templates-qubes/templates/config_files/x86/xen-efi.cfg
View File

@ -1,7 +1,12 @@
[global] [global]
default=qubes default=qubes
[qubes] [qubes-check]
options=loglvl=all options=loglvl=all
kernel=vmlinuz @ROOT@ rd.live.check kernel=vmlinuz @ROOT@ rd.live.check
ramdisk=initrd.img ramdisk=initrd.img
[qubes]
options=loglvl=all
kernel=vmlinuz @ROOT@
ramdisk=initrd.img

6
lorax-templates-qubes/templates/efi.tmpl
View File

@ -11,7 +11,6 @@ mkdir ${EFIBOOTDIR}/fonts/
install boot/efi/EFI/*/gcd${efiarch|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi install boot/efi/EFI/*/gcd${efiarch|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi
# keep also under original name to make mkefiboot --apple happy # keep also under original name to make mkefiboot --apple happy
install boot/efi/EFI/*/gcd${efiarch|lower}.efi ${EFIBOOTDIR}/grub${efiarch|lower}.efi install boot/efi/EFI/*/gcd${efiarch|lower}.efi ${EFIBOOTDIR}/grub${efiarch|lower}.efi
install boot/efi/EFI/*/xen*.efi ${EFIBOOTDIR}/xen-check.efi
install boot/efi/EFI/*/xen*.efi ${EFIBOOTDIR}/xen.efi install boot/efi/EFI/*/xen*.efi ${EFIBOOTDIR}/xen.efi
install boot/efi/EFI/*/MokManager.efi ${EFIBOOTDIR}/ install boot/efi/EFI/*/MokManager.efi ${EFIBOOTDIR}/
install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
@ -27,8 +26,7 @@ ${make_efiboot("images/efiboot.img", include_kernel=True)}
<% <%
kdir = EFIBOOTDIR if include_kernel else KERNELDIR kdir = EFIBOOTDIR if include_kernel else KERNELDIR
eficonf = "%s/grub.cfg" % (EFIBOOTDIR, ) eficonf = "%s/grub.cfg" % (EFIBOOTDIR, )
xenconf = "%s/xen-check.cfg" % (EFIBOOTDIR, ) xenconf = "%s/xen.cfg" % (EFIBOOTDIR, )
xenconf_no_check = "%s/xen.cfg" % (EFIBOOTDIR, )
args = "--label=ANACONDA --debug" args = "--label=ANACONDA --debug"
if disk: args += " --disk" if disk: args += " --disk"
if imgtype == "apple": args += ' --apple --icon=%s --diskname=%s --product="%s %s"' % (APPLE_EFI_ICON, APPLE_EFI_DISKNAME, product.name, product.version) if imgtype == "apple": args += ' --apple --icon=%s --diskname=%s --product="%s %s"' % (APPLE_EFI_ICON, APPLE_EFI_DISKNAME, product.name, product.version)
@ -54,8 +52,6 @@ ${make_efiboot("images/efiboot.img", include_kernel=True)}
replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf} replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf}
replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${xenconf} replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${xenconf}
%endif %endif
copy ${xenconf} ${xenconf_no_check}
replace rd.live.check '' ${xenconf_no_check}
%if efiarch == 'IA32': %if efiarch == 'IA32':
copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf
%endif %endif