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 D6F12138331 for ; Mon, 5 Mar 2018 20:45:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FDD0E0809; Mon, 5 Mar 2018 20:45:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2A3FE0809 for ; Mon, 5 Mar 2018 20:45:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5A54335C06 for ; Mon, 5 Mar 2018 20:45:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46EAB23D for ; Mon, 5 Mar 2018 20:45:14 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1520282523.28d1d8f38a60a099ba4c4aa5e97e02be74ff12b2.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/bootloader-setup.sh X-VCS-Directories: targets/support/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 28d1d8f38a60a099ba4c4aa5e97e02be74ff12b2 X-VCS-Branch: master Date: Mon, 5 Mar 2018 20:45:14 +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: fa26758a-1ab1-4568-97c8-4ec7d15e3dc3 X-Archives-Hash: 6d338c24d95d5477846e5e16d92b1a56 commit: 28d1d8f38a60a099ba4c4aa5e97e02be74ff12b2 Author: Ben Kohler gmail com> AuthorDate: Mon Feb 19 17:21:54 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Mon Mar 5 20:42:03 2018 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=28d1d8f3 bootloader-setup.sh: add config generator for grub2 targets/support/bootloader-setup.sh | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index ffe7be2f..8d3e5e7d 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -338,6 +338,38 @@ case ${clst_hostarch} in echo " localboot -1" >> $icfg echo " MENU HIDE" >> $icfg fi + + # GRUB2 + if [ -d $1/grub ] + then + if [ -e $1/isolinux/isolinux.bin ] + then + kern_subdir=/isolinux + else + cp -f $1/boot/* $1/grub + kern_subdir=/grub + fi + + iacfg=$1/grub/grub.cfg + echo 'set default=0' > ${iacfg} + echo 'set gfxpayload=keep' >> ${iacfg} + echo 'set timeout=10' >> ${iacfg} + echo 'insmod all_video' >> ${iacfg} + echo '' >> ${iacfg} + for x in ${clst_boot_kernel} + do + echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg} + echo " linux ${kern_subdir}/${x} ${default_append_line}" >> ${iacfg} + echo " initrd ${kern_subdir}/${x}.igz" >> ${iacfg} + echo "}" >> ${iacfg} + echo "" >> ${iacfg} + echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {" >> ${iacfg} + echo " linux ${kern_subdir}/${x} ${default_append_line}" >> ${iacfg} + echo " initrd ${kern_subdir}/${x}.igz" >> ${iacfg} + echo "}" >> ${iacfg} + echo "" >> ${iacfg} + done + fi if [ -e $1/boot/efi/elilo.efi ] then @@ -362,7 +394,8 @@ case ${clst_hostarch} in done cp ${iacfg} $1/boot/efi/boot fi - + + # GRUB legacy (0.97) if [ -e $1/boot/grub/stage2_eltorito ] then icfg=$1/boot/grub/menu.lst