sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix to load only signed kernel in UEFI secure boot"

Browse source
This commit is contained in:
Jenkins 2015-04-28 11:02:52 +00:00 committed by Gerrit Code Review
commit b7c22723d4
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
elements/iso/cleanup.d/100-build-iso
View file

@ -60,16 +60,11 @@ function build_iso() {
SCRIPTNAME=$(basename $0) SCRIPTNAME=$(basename $0)
SCRIPTDIR=$(dirname $0) SCRIPTDIR=$(dirname $0)
MKISOFS="/usr/bin/mkisofs" MKISOFS="/usr/bin/mkisofs"
if [ $DISTRO_NAME = "fedora" ]; then if [ $DISTRO_NAME = "fedora" ]; then
EFI_BOOT_DIR="EFI/fedora" EFI_BOOT_DIR="EFI/fedora"
GRUB_LINUX_TAG="linuxefi"
GRUB_INITRD_TAG="initrdefi"
EXTRA_KERNEL_PARAMS="usbcore.autosuspend=-1" EXTRA_KERNEL_PARAMS="usbcore.autosuspend=-1"
else else
EFI_BOOT_DIR="EFI/ubuntu" EFI_BOOT_DIR="EFI/ubuntu"
GRUB_LINUX_TAG="linux"
GRUB_INITRD_TAG="initrd"
EXTRA_KERNEL_PARAMS="" EXTRA_KERNEL_PARAMS=""
fi fi
@ -117,8 +112,8 @@ set hidden_timeout_quiet=false
menuentry "install" { menuentry "install" {
search --set=root --label VMEDIA_BOOT_ISO search --set=root --label VMEDIA_BOOT_ISO
$GRUB_LINUX_TAG /vmlinuz $EXTRA_KERNEL_PARAMS $KERNEL_CMDLINE_ARGS -- linuxefi /vmlinuz $EXTRA_KERNEL_PARAMS $KERNEL_CMDLINE_ARGS --
$GRUB_INITRD_TAG /initrd initrdefi /initrd
} }
END_CONFIG END_CONFIG