From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4270713832E for ; Sat, 13 Aug 2016 23:27:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B634BE0B8F; Sat, 13 Aug 2016 23:27:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED072E0B8F for ; Sat, 13 Aug 2016 23:27:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0506B340CCC for ; Sat, 13 Aug 2016 23:27:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 706058F4 for ; Sat, 13 Aug 2016 23:27:03 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1471130617.d0e7c2c7b9615ca369970bf37ae7ad16c293ee17.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_bootloader.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: d0e7c2c7b9615ca369970bf37ae7ad16c293ee17 X-VCS-Branch: master Date: Sat, 13 Aug 2016 23:27:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c568a988-152a-4049-8963-6df3ceafdd4d X-Archives-Hash: 18d449a7d17d97b32a36a9e8e8093e65 commit: d0e7c2c7b9615ca369970bf37ae7ad16c293ee17 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Aug 13 23:23:37 2016 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Aug 13 23:23:37 2016 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d0e7c2c7 gen_bootloader: grub2-mkconfig is sometimes now grub-mkconfig, per bug #591200. Signed-off-by: Robin H. Johnson gentoo.org> gen_bootloader.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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}" }