summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2016-08-13 16:35:55 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2016-08-15 00:02:19 -0700
commit0b64552ca5105e36cd0ea4257dca3abdbcf2c3d6 (patch)
treee41344bf02f76a20d826be15d017b8205326e626 /sys-kernel/genkernel/files
parentdev-qt/qtx11extras: Stable for HPPA PPC64 (bug #586180). (diff)
downloadgentoo-0b64552ca5105e36cd0ea4257dca3abdbcf2c3d6.tar.gz
gentoo-0b64552ca5105e36cd0ea4257dca3abdbcf2c3d6.tar.bz2
gentoo-0b64552ca5105e36cd0ea4257dca3abdbcf2c3d6.zip
sys-kernel/genkernel: backport grub-mkconfig change from master, per bug #591200
Package-Manager: portage-2.2.28
Diffstat (limited to 'sys-kernel/genkernel/files')
-rw-r--r--sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch
new file mode 100644
index 00000000000..9e55301228a
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch
@@ -0,0 +1,17 @@
+diff --git a/gen_bootloader.sh b/gen_bootloader.sh
+index 4bbd303..fdca749 100755
+--- a/gen_bootloader.sh
++++ b/gen_bootloader.sh
+@@ -49,8 +49,10 @@ set_bootloader_grub2() {
+ fi
+
+ print_info 1 "You can customize Grub2 parameters in /etc/default/grub."
+- print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..."
+- grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || gen_die "grub2-mkconfig failed"
++ print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..."
++ grub-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
++ grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
++ gen_die "grub-mkconfig failed"
+ [ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}"
+ }
+