From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1160255-garchives=archives.gentoo.org@lists.gentoo.org>
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 77961138351
	for <garchives@archives.gentoo.org>; Fri, 10 Apr 2020 06:18:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 85B96E0893;
	Fri, 10 Apr 2020 06:18:43 +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 5AA25E0893
	for <gentoo-commits@lists.gentoo.org>; Fri, 10 Apr 2020 06:18:43 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(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 CB90B34EFAC
	for <gentoo-commits@lists.gentoo.org>; Fri, 10 Apr 2020 06:18:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FB01103
	for <gentoo-commits@lists.gentoo.org>; Fri, 10 Apr 2020 06:18:39 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1586498998.6d0cbf4d3a54848d24daec21bb2a5eed60fe278f.mattst88@gentoo>
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
X-VCS-Repository: proj/catalyst
X-VCS-Files: targets/support/bootloader-setup.sh targets/support/functions.sh
X-VCS-Directories: targets/support/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 6d0cbf4d3a54848d24daec21bb2a5eed60fe278f
X-VCS-Branch: master
Date: Fri, 10 Apr 2020 06:18:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f601a83a-c1fd-41cf-a272-6549b1656141
X-Archives-Hash: 4045e0f0b7c2eb463b5c30e135f78917

commit:     6d0cbf4d3a54848d24daec21bb2a5eed60fe278f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 04:54:36 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 06:09:58 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6d0cbf4d

targets: Share grub.cfg generation code

To do this, I had to fix what looks like a mistake to me: grub.cfg was
written to /grub/grub.cfg instead of /boot/grub/grub.cfg.

The "boot/kernel/<label>/console" spec option is supported by the other
grub.cfg generation path, so we now get it on x86/amd64 as well.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 28 +---------------------------
 targets/support/functions.sh        |  2 +-
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 0e6a7383..2119e521 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -154,33 +154,7 @@ case ${clst_hostarch} in
 			echo "  localboot -1" >> $icfg
 			echo "  MENU HIDE" >> $icfg
 		fi
-
-		# GRUB2
-		if [ -d $1/grub ] || [ -f "$1/boot/EFI/BOOT/BOOTX64.EFI" ]
-		then
-			mkdir -p "$1/grub"
-
-			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 /boot/${x} ${default_append_line}" >> ${iacfg}
-				echo "	initrd /boot/${x}.igz" >> ${iacfg}
-				echo "}" >> ${iacfg}
-				echo "" >> ${iacfg}
-				echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {"  >> ${iacfg}
-				echo "	linux /boot/${x} ${default_append_line} docache" >> ${iacfg}
-				echo "	initrd /boot/${x}.igz" >> ${iacfg}
-				echo "}" >> ${iacfg}
-				echo "" >> ${iacfg}
-			done
-		fi
-	;;
+	;&
 	ia64|ppc*|powerpc*|sparc*)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index d3414f80..9da13baf 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -93,7 +93,7 @@ create_bootloader() {
   echo "insmod part_gpt" > grub-stub.cfg
   echo "insmod part_msdos" >> grub-stub.cfg
   echo "search --no-floppy --set=root --file /livecd" >> grub-stub.cfg
-  echo "configfile /grub/grub.cfg" >> grub-stub.cfg
+  echo "configfile /boot/grub/grub.cfg" >> grub-stub.cfg
 
   # some 64 bit machines have 32 bit UEFI, and you might want to boot 32 bit on a 64 bit machine, so we take the safest path and include both
   # set up 32 bit uefi