From 2549cee9a81b6c7db01edbd7997e44501064f9cd Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Jun 24 2014 15:09:15 +0000 Subject: Patch for secureboot CentOS keys --- diff --git a/SOURCES/centos.cer b/SOURCES/centos.cer new file mode 100644 index 0000000..00a5580 Binary files /dev/null and b/SOURCES/centos.cer differ diff --git a/SOURCES/secureboot.cer b/SOURCES/secureboot.cer deleted file mode 100644 index 4ff8b79..0000000 Binary files a/SOURCES/secureboot.cer and /dev/null differ diff --git a/SOURCES/securebootca.cer b/SOURCES/securebootca.cer deleted file mode 100644 index b235400..0000000 Binary files a/SOURCES/securebootca.cer and /dev/null differ diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index 6d32e60..fa93878 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -51,8 +51,7 @@ Obsoletes: grub < 1:0.98 Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz #Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz -Source1: securebootca.cer -Source2: secureboot.cer +Source1: centos.cer Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source5: theme.tar.bz2 #Source6: grub-cd.cfg @@ -228,10 +227,10 @@ GRUB_MODULES=" all_video boot btrfs cat chain configfile echo efifwsetup \ mdraid09 mdraid1x blscfg multiboot2 multiboot tftp" ./grub-mkimage -O %{grubefiarch} -o %{grubeficdname}.orig -p /EFI/BOOT \ -d grub-core ${GRUB_MODULES} -%pesign -s -i %{grubeficdname}.orig -o %{grubeficdname} -a %{SOURCE1} -c %{SOURCE2} -n redhatsecureboot301 +%pesign -s -i %{grubeficdname}.orig -o %{grubeficdname} -a %{SOURCE1} -c %{SOURCE1} -n redhatsecureboot301 ./grub-mkimage -O %{grubefiarch} -o %{grubefiname}.orig -p /EFI/%{efidir} \ -d grub-core ${GRUB_MODULES} -%pesign -s -i %{grubefiname}.orig -o %{grubefiname} -a %{SOURCE1} -c %{SOURCE2} -n redhatsecureboot301 +%pesign -s -i %{grubefiname}.orig -o %{grubefiname} -a %{SOURCE1} -c %{SOURCE1} -n redhatsecureboot301 cd .. %endif @@ -491,6 +490,9 @@ fi %{_datarootdir}/grub/themes/ %changelog +* Fri Jun 20 2014 Karanbir Singh - 2.02-0.2.10.el7.centos +- Roll in CentOS Secureboot keys + * Thu Mar 20 2014 Peter Jones - 2.02-0.2.10 - Fix GRUB_DISABLE_SUBMENU one more time. Resolves: rhbz#1063414