From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SH0OB-0008UY-C2 for garchives@archives.gentoo.org; Sun, 08 Apr 2012 22:15:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A6C5E0B2F; Sun, 8 Apr 2012 22:14:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3B65BE0B2F for ; Sun, 8 Apr 2012 22:14:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A02EF1B40AB for ; Sun, 8 Apr 2012 22:14:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6685BE5402 for ; Sun, 8 Apr 2012 22:14:46 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1333918028.175270768e9c4e5d9c74b51f9e6ebdcd9070439f.sping@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: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 175270768e9c4e5d9c74b51f9e6ebdcd9070439f X-VCS-Branch: master Date: Sun, 8 Apr 2012 22:14:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4a59c284-bc88-4178-a9c7-070303a9b271 X-Archives-Hash: 0d51e16e5efd322d53af5ad4fe305a89 commit: 175270768e9c4e5d9c74b51f9e6ebdcd9070439f Author: Sebastian Pipping pipping org> AuthorDate: Sun Apr 8 19:41:19 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sun Apr 8 20:47:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D17527076 Reduce code duplication in set_bootloader_grub --- gen_bootloader.sh | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gen_bootloader.sh b/gen_bootloader.sh index 1debfe9..d14b313 100755 --- a/gen_bootloader.sh +++ b/gen_bootloader.sh @@ -33,20 +33,24 @@ set_bootloader_grub_read_device_map() { =20 set_bootloader_grub2() { local GRUB_CONF - if [ -e "${BOOTDIR}/grub2/grub.cfg" ] - then - GRUB_CONF=3D"${BOOTDIR}/grub2/grub.cfg" - elif [ -e "${BOOTDIR}/grub/grub.cfg" ] - then - GRUB_CONF=3D"${BOOTDIR}/grub/grub.cfg" - else + for candidate in \ + "${BOOTDIR}/grub2/grub.cfg" \ + "${BOOTDIR}/grub/grub.cfg" \ + ; do + if [[ -e "${candidate}" ]]; then + GRUB_CONF=3D${candidate} + break + fi + done + + if [[ -z "${GRUB_CONF}" ]]; then print_error 1 "Error! Grub2 configuration file does not exist, please = ensure grub2 is correctly setup first." - return 0 + return 0 fi =20 print_info 1 "You can customize Grub2 parameters in /etc/defaults/gr= ub." print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..." - grub-mkconfig -o ${GRUB_CONF} + grub-mkconfig -o "${GRUB_CONF}" } =20 set_bootloader_grub() {