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

Install all available kernels by default (#581)

Browse Source 
Anaconda/pungi doesn't support multiple versions of the same package at
the time, so place all kernels on installation media in separate
directory and install them in %post script.
This commit is contained in:
Marek Marczykowski-Górecki 2013-08-27 01:00:28 +02:00
parent 05c26844ca
commit 76f22a0ea0
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
anaconda/data/post-scripts/40-qubes-alt-kernels.ks Normal file
View File

@ -0,0 +1,8 @@
%post --nochroot
for pkg in /run/install/repo/extrakernels/*.rpm; do
name=`basename $pkg .rpm`
rpm --root=$ANA_INSTALL_PATH -q $name > /dev/null || rpm --root=$ANA_INSTALL_PATH -i --oldpackage $pkg
done
%end

2
anaconda/data/post-scripts/Makefile.am
View File

@ -18,5 +18,5 @@
# Author: Chris Lumens <clumens@redhat.com> # Author: Chris Lumens <clumens@redhat.com>
postscriptsdir = $(datadir)/$(PACKAGE_NAME)/post-scripts postscriptsdir = $(datadir)/$(PACKAGE_NAME)/post-scripts
dist_postscripts_DATA = 50-qubes.ks 80-setfilecons.ks 90-copy-screenshots.ks 99-copy-logs.ks dist_postscripts_DATA = 40-qubes-alt-kernels.ks 50-qubes.ks 80-setfilecons.ks 90-copy-screenshots.ks 99-copy-logs.ks
MAINTAINERCLEAFILES = Makefile.in MAINTAINERCLEAFILES = Makefile.in

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

@ -78,6 +78,7 @@ label vesa
endtext endtext
kernel mboot.c32 kernel mboot.c32
append xen.gz --- vmlinuz @ROOT@ xdriver=vesa nomodeset quiet --- initrd.img append xen.gz --- vmlinuz @ROOT@ xdriver=vesa nomodeset quiet --- initrd.img
@EXTRAKERNELS@
label rescue label rescue
menu indent count 5 menu indent count 5
menu label ^Rescue a @PRODUCT@ system menu label ^Rescue a @PRODUCT@ system
@ -100,7 +101,6 @@ label local
menu label Boot from ^local drive menu label Boot from ^local drive
localboot 0xffff localboot 0xffff
menu separator # insert an empty line menu separator # insert an empty line
menu separator # insert an empty line
label returntomain label returntomain
menu label Return to ^main menu menu label Return to ^main menu
menu exit menu exit

5
lorax-templates-qubes/templates/x86.tmpl
View File

@ -6,6 +6,7 @@ PXEBOOTDIR="images/pxeboot"
BOOTDIR="isolinux" BOOTDIR="isolinux"
KERNELDIR=PXEBOOTDIR KERNELDIR=PXEBOOTDIR
LIVEDIR="LiveOS" LIVEDIR="LiveOS"
EXTRAKERNELS="extrakernels"
%> %>
mkdir ${LIVEDIR} mkdir ${LIVEDIR}
@ -24,6 +25,10 @@ install ${configdir}/grub.conf ${BOOTDIR}
install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png
install boot/memtest* ${BOOTDIR}/memtest install boot/memtest* ${BOOTDIR}/memtest
mkdir ${EXTRAKERNELS}
# bypass "chroot" enforced by Lorax parser
install ../../../../yum/qubes-dom0/rpm/kernel-[0-9]*rpm ${EXTRAKERNELS}
## install kernels ## install kernels
mkdir ${KERNELDIR} mkdir ${KERNELDIR}
%for kernel in kernels: %for kernel in kernels: