From 1187130df92848ef94891eb83e4bf8f39d2b6c37 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Nov 20 2016 13:55:05 +0000 Subject: manual debranding after auto debranding failed --- diff --git a/.gitignore b/.gitignore index 0342d81..618dc68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ SOURCES/grub-2.02~beta2.tar.xz SOURCES/theme.tar.bz2 SOURCES/unifont-5.1.20080820.pcf.gz +SOURCES/centos.cer diff --git a/.grub2.metadata b/.grub2.metadata index 261f908..a5c2c6a 100644 --- a/.grub2.metadata +++ b/.grub2.metadata @@ -1,3 +1,4 @@ 1bf580f1e8bce4909a7ac7ca485cee02b00ed383 SOURCES/grub-2.02~beta2.tar.xz cf0b7763c528902da7e8b05cfa248f20c8825ce5 SOURCES/theme.tar.bz2 87f8600ba24e521b5d20bdf6c4b71af8ae861e3a SOURCES/unifont-5.1.20080820.pcf.gz +6e9105eb51e55a46761838f289a917611cad8091 SOURCES/centos.cer diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/0001-centos-grub2-password-fix.patch b/SOURCES/0001-centos-grub2-password-fix.patch new file mode 100644 index 0000000..ac0966b --- /dev/null +++ b/SOURCES/0001-centos-grub2-password-fix.patch @@ -0,0 +1,25 @@ +From b6370991cc254737d07d04d2dca4fef1215e2536 Mon Sep 17 00:00:00 2001 +From: Johnny Hughes +Date: Tue, 15 Dec 2015 12:26:48 -0600 +Subject: [PATCH] centos grub2-password fix + +--- + util/grub-setpassword.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in +index dd76f00..a322dfb 100755 +--- a/util/grub-setpassword.in ++++ b/util/grub-setpassword.in +@@ -1,7 +1,7 @@ + #!/bin/sh -e + + if [ -d /sys/firmware/efi/efivars/ ]; then +- grubdir=`echo "/@bootdirname@/efi/EFI/redhat/" | sed 's,//*,/,g'` ++ grubdir=`echo "/@bootdirname@/efi/EFI/centos/" | sed 's,//*,/,g'` + else + grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'` + fi +-- +1.8.3.1 + diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index 941993f..9259c13 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -33,6 +33,9 @@ %if 0%{?fedora} %global efidir fedora %endif +%if 0%{?centos} +%global efidir centos +%endif %endif @@ -51,8 +54,8 @@ URL: http://www.gnu.org/software/grub/ 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 +#(source removed) Source3: grub.patches Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source5: theme.tar.bz2 @@ -61,6 +64,8 @@ Source6: gitignore %include %{SOURCE3} +Patch9999: 0001-centos-grub2-password-fix.patch + BuildRequires: flex bison binutils python BuildRequires: ncurses-devel xz-devel bzip2-devel BuildRequires: freetype-devel libusb-devel @@ -209,8 +214,8 @@ GRUB_MODULES="${GRUB_MODULES} linuxefi" mv %{grubefiname}.orig %{grubefiname} mv %{grubeficdname}.orig %{grubeficdname} %else -%pesign -s -i %{grubefiname}.orig -o %{grubefiname} -a %{SOURCE1} -c %{SOURCE2} -n redhatsecureboot301 -%pesign -s -i %{grubeficdname}.orig -o %{grubeficdname} -a %{SOURCE1} -c %{SOURCE2} -n redhatsecureboot301 +%pesign -s -i %{grubefiname}.orig -o %{grubefiname} -a %{SOURCE1} -c %{SOURCE1} -n redhatsecureboot301 +%pesign -s -i %{grubeficdname}.orig -o %{grubeficdname} -a %{SOURCE1} -c %{SOURCE1} -n redhatsecureboot301 %endif cd .. %endif @@ -516,6 +521,11 @@ fi %exclude %{_datarootdir}/grub/themes/starfield %changelog +* Sun Nov 20 2016 Johnny Hughes - 2.02-0.44 +- Roll in CentOS Secureboot keys +- Move the edidir to be CentOS, so people can co-install fedora, rhel and centos +- add 0001-centos-grub2-password-fix.patch + * Mon Aug 29 2016 Peter Jones - 2.02-0.44 - Work around tftp servers that don't work with multiple consecutive slashes in file paths.