public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/diskimage-stage2/, targets/support/
@ 2024-10-05  9:08 Andreas K. Hüttel
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-10-05  9:08 UTC (permalink / raw
  To: gentoo-commits

commit:     94fd1cbfd1e519700ff17b372d0b42d83e51229d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  5 09:08:29 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct  5 09:08:29 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=94fd1cbf

minor

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/diskimage-stage2/controller.sh | 4 ----
 targets/support/create-qcow2.sh        | 9 ++++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/targets/diskimage-stage2/controller.sh b/targets/diskimage-stage2/controller.sh
index 9cbf6824..d7a4e731 100755
--- a/targets/diskimage-stage2/controller.sh
+++ b/targets/diskimage-stage2/controller.sh
@@ -26,8 +26,6 @@ case $1 in
 		;;
 
 	preclean)
-		cp -f ${clst_sharedir}/diskimage/files/livecd-local.start \
-			${clst_chroot_path}/etc/conf.d/local.start
 		;;
 
 	livecd-update)
@@ -48,8 +46,6 @@ case $1 in
 
 	bootloader)
 		shift
-		# Here is where we poke in our identifier
-		touch $1/livecd
 
 		# We create a firmware directory, if necessary
 		if [ -e ${clst_chroot_path}/lib/firmware.tar.bz2 ]

diff --git a/targets/support/create-qcow2.sh b/targets/support/create-qcow2.sh
index 9b5dce12..fc21093b 100755
--- a/targets/support/create-qcow2.sh
+++ b/targets/support/create-qcow2.sh
@@ -44,11 +44,14 @@ parted -s /dev/nbd0 mklabel gpt || die "Cannot create disklabel"
 
 # create an EFI boot partition
 parted -s /dev/nbd0 -- mkpart efi fat32 1M {clst_qcow2_efisize}GiB || die "Cannot create EFI partition"
+# mark it as such
 
 # if requested, create a swap partition
+# mark it as such
 
 # fill the rest of the image with the root partition
-parted -s /dev/nbd0 -- mkpart root ${clst_qcow2_roottype} ${clst_qcow2_efisize}GiB -1s || die "Cannot create root partition"
+parted -s /dev/nbd0 -- mkpart root ${clst_qcow2_roottype} ${clst_qcow2_efisize}GiB -1M || die "Cannot create root partition"
+# mark it as such
 
 # re-read the partition table
 partprobe /dev/nbd0 || die "Probing partition table failed"
@@ -76,8 +79,8 @@ cp -a "${clst_target_path}"/* "${my_mountpoint}/"
 # (locale, timezone, ssh) - though most of it will be done by cloud-init
 
 
-# now let's install an efi loader
-bootctl --no-variables --graceful install
+# now let's install an efi loader inside
+# bootctl --no-variables --graceful install
 
 # unmount things
 umount "${my_mountpoint}/boot" || die "Could not unmount boot partition"


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/diskimage-stage2/, targets/support/
@ 2024-10-11 20:14 Andreas K. Hüttel
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-10-11 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     a664d1fcf818ecdeff4c35d58731fe6442991930
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 18:12:54 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 18:12:54 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a664d1fc

Prepare for separate bootloader codepath

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/diskimage-stage2/controller.sh    |  17 +--
 targets/support/qcow2-bootloader-setup.sh | 166 ++++++++++++++++++++++++++++--
 2 files changed, 162 insertions(+), 21 deletions(-)

diff --git a/targets/diskimage-stage2/controller.sh b/targets/diskimage-stage2/controller.sh
index dce37172..2c70642c 100755
--- a/targets/diskimage-stage2/controller.sh
+++ b/targets/diskimage-stage2/controller.sh
@@ -46,21 +46,10 @@ case $1 in
 
 	bootloader)
 		shift
+		# We don't have to create any directories or copy any stuff here, since
+		# the qcow2 has no internal squashfs or similar
 
-		# We create a firmware directory, if necessary
-		if [ -e ${clst_chroot_path}/lib/firmware.tar.bz2 ]
-		then
-			echo "Creating firmware directory in $1"
-			mkdir -p $1/firmware
-			# TODO: Unpack firmware into $1/firmware and remove it from the
-			# chroot so newer livecd-tools/genkernel can find it and unpack it.
-		fi
-
-		if [ -e ${clst_chroot_path}/boot/memtest86plus/ ]; then
-			cp -rv ${clst_chroot_path}/boot/memtest86plus/* $1
-		fi
-
-		${clst_shdir}/support/iso-bootloader-setup.sh $1
+		${clst_shdir}/support/qcow2-bootloader-setup.sh $1
 		;;
 
 	unmerge)

diff --git a/targets/support/qcow2-bootloader-setup.sh b/targets/support/qcow2-bootloader-setup.sh
index be577ada..34d95dc9 100755
--- a/targets/support/qcow2-bootloader-setup.sh
+++ b/targets/support/qcow2-bootloader-setup.sh
@@ -13,16 +13,32 @@ extract_kernels $1/boot
 cmdline_opts=()
 
 # Add any additional options
-if [ -n "${clst_qcow2_bootargs}" ]
+if [ -n "${clst_livecd_bootargs}" ]
 then
-	for x in ${clst_qcow2_bootargs}
+	for x in ${clst_livecd_bootargs}
 	do
 		cmdline_opts+=(${x})
 	done
 fi
 
+case ${clst_fstype} in
+	squashfs)
+		cmdline_opts+=(looptype=squashfs loop=/image.squashfs)
+	;;
+	jffs2)
+		cmdline_opts+=(looptype=jffs2 loop=/image.jffs2)
+	;;
+esac
+
 # Optional memtest setups
 memtest_grub() {
+  if [[ -e $1/memtest64.bios ]]; then
+    echo 'if [ "x$grub_platform" = xpc ]; then'
+    echo '  menuentry "Memtest86+ 64bit BIOS" {'
+    echo '    linux "/memtest64.bios"'
+    echo '  }'
+    echo 'fi'
+  fi
   if [[ -e $1/memtest.efi64 ]]; then
     echo 'if [ "x$grub_platform" = xefi ]; then'
     echo '  menuentry "Memtest86+ 64bit UEFI" {'
@@ -30,13 +46,65 @@ memtest_grub() {
     echo '  }'
     echo 'fi'
   fi
+  if [[ -e $1/memtest32.bios ]]; then
+    echo 'menuentry "Memtest86+ 32bit BIOS" {'
+    echo '  linux "/memtest32.bios"'
+    echo '}'
+  fi
 }
 
-default_append_line=(${cmdline_opts[@]})
-default_dracut_append_line=(${clst_qcow2_bootargs})
+default_append_line=(${cmdline_opts[@]} cdroot)
+default_dracut_append_line=(${clst_livecd_bootargs} root=live:CDLABEL=${clst_iso_volume_id} rd.live.dir=/ rd.live.squashimg=image.squashfs cdroot)
 
 case ${clst_hostarch} in
-	amd64|arm64|ppc64*)
+	alpha)
+		# NO SOFTLEVEL SUPPORT YET
+		acfg=$1/etc/aboot.conf
+		bctr=0
+		# Pass 1 is for non-serial
+		for x in ${clst_boot_kernel}
+		do
+			echo -n "${bctr}:/boot/${x} " >> ${acfg}
+			echo -n "initrd=/boot/${x}.igz " >> ${acfg}
+			echo "${cmdline_opts[@]} cdroot" >> ${acfg}
+			((bctr=${bctr}+1))
+		done
+		# Pass 2 is for serial
+		cmdline_opts+=(console=ttyS0)
+		for x in ${clst_boot_kernel}
+		do
+			echo -n "${bctr}:/boot/${x} " >> ${acfg}
+			echo -n "initrd=/boot/${x}.igz " >> ${acfg}
+			echo "${cmdline_opts[@]} cdroot" >> ${acfg}
+			((bctr=${bctr}+1))
+		done
+	;;
+	arm)
+		# NO SOFTLEVEL SUPPORT YET
+	;;
+	hppa)
+		# NO SOFTLEVEL SUPPORT YET
+		mkdir -p $1/boot
+
+		icfg=$1/boot/palo.conf
+		kmsg=$1/boot/kernels.msg
+		hmsg=$1/boot/help.msg
+		# Make sure we strip the extension to the kernel to allow palo to choose
+		boot_kernel_common_name=${first/%32/}
+		boot_kernel_common_name=${boot_kernel_common_name/%64/}
+
+		# copy the bootloader for the final image
+		cp /usr/share/palo/iplboot $1/boot/
+
+		echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line[@]}" >> ${icfg}
+		echo "--bootloader=boot/iplboot" >> ${icfg}
+		echo "--ramdisk=boot/${first}.igz" >> ${icfg}
+		for x in ${clst_boot_kernel}
+		do
+			echo "--recoverykernel=boot/${x}" >> ${icfg}
+		done
+	;;
+	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86|i?86)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg
 		mkdir -p $1/boot/grub
@@ -50,10 +118,9 @@ case ${clst_hostarch} in
 			eval "kernel_console=\$clst_boot_kernel_${x}_console"
 			eval "distkernel=\$clst_boot_kernel_${x}_distkernel"
 
-			echo "menuentry 'Boot Gentoo image (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}
+			echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}
 			if [ ${distkernel} = "yes" ]
 			then
-				# FIXME: what can we search for here?
 				echo "	search --no-floppy --set=root -l ${clst_iso_volume_id}" >> ${iacfg}
 				echo "	linux ${kern_subdir}/${x} ${default_dracut_append_line[@]}" >> ${iacfg}
 			else
@@ -62,8 +129,93 @@ case ${clst_hostarch} in
 			echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
 			echo "}" >> ${iacfg}
 			echo "" >> ${iacfg}
+			echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {"  >> ${iacfg}
+			if [ ${distkernel} = "yes" ]
+			then
+				echo "	search --no-floppy --set=root -l ${clst_iso_volume_id}" >> ${iacfg}
+				echo "	linux ${kern_subdir}/${x} ${default_dracut_append_line[@]} rd.live.ram=1" >> ${iacfg}
+			else
+				echo "	linux ${kern_subdir}/${x} ${default_append_line[@]} docache" >> ${iacfg}
+			fi
+
+			echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+			echo "}" >> ${iacfg}
+			if [ -n "${kernel_console}" ]
+			then
+			echo "submenu 'Special console options (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg}
+				for y in ${kernel_console}
+				do
+					echo "menuentry 'Boot LiveCD (kernel: ${x} console=${y})' --class gnu-linux --class os {"  >> ${iacfg}
+					echo "	linux ${kern_subdir}/${x} ${default_append_line[@]} console=${y}" >> ${iacfg}
+					echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+					echo "}" >> ${iacfg}
+					echo "" >> ${iacfg}
+				done
+				echo "}" >> ${iacfg}
+			fi
+			echo "" >> ${iacfg}
 		done
 		memtest_grub $1 >> ${iacfg}
 	;;
+	mips)
+		# NO SOFTLEVEL SUPPORT YET
+
+		# Mips is an interesting arch -- where most archs will
+		# use ${1} as the root of the LiveCD, an SGI LiveCD lacks
+		# such a root.  Instead, we will use ${1} as a scratch
+		# directory to build the components we need for the
+		# CD image, and then pass these components to the
+		# `sgibootcd` tool which outputs a final CD image
+		scratch="${1}"
+		mkdir -p ${scratch}/{kernels/misc,arcload}
+		echo "" > ${scratch}/arc.cf
+
+		# Move kernel binaries to ${scratch}/kernels, and
+		# move everything else to ${scratch}/kernels/misc
+		for x in ${clst_boot_kernel}; do
+			[ -e "${1}/boot/${x}" ] && mv ${1}/boot/${x} ${scratch}/kernels
+			[ -e "${1}/boot/${x}.igz" ] && mv ${1}/boot/${x}.igz ${scratch}/kernels/misc
+		done
+		[ -d "${1}/boot" ] && rmdir ${1}/boot
+
+		# Source the arcload source file to generated required sections of arc.cf
+		source ${clst_shdir}/support/mips-arcload_conf.sh
+
+		# Generate top portions of the config
+		echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf
+
+		# Next, figure out what kernels were specified in the
+		# spec file, and generate the appropriate arcload conf
+		# blocks specific to each system
+		ip22="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip22" | tr "\n" " ")"
+		ip27="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip27" | tr "\n" " ")"
+		ip28="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip28" | tr "\n" " ")"
+		ip30="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip30" | tr "\n" " ")"
+		ip32="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip32" | tr "\n" " ")"
+
+		if [ -n "${ip22}" ]; then
+			echo -e "${ip22base}" >> ${scratch}/arc.cf
+			for x in ${ip22}; do echo -e "${!x}" >> ${scratch}/arc.cf; done
+			echo -e "${ip22vid}${ip22x}" >> ${scratch}/arc.cf
+		fi
+
+		[ -n "${ip27}" ] && echo -e "${ip27base}" >> ${scratch}/arc.cf
+		[ -n "${ip28}" ] && echo -e "${ip28base}" >> ${scratch}/arc.cf
+		[ -n "${ip30}" ] && echo -e "${ip30base}" >> ${scratch}/arc.cf
+
+		if [ -n "${ip32}" ]; then
+			echo -e "${ip32base}" >> ${scratch}/arc.cf
+			for x in ${ip32}; do echo -e "${!x}" >> ${scratch}/arc.cf; done
+			echo -e "${ip32vid}${ip32x}" >> ${scratch}/arc.cf
+		fi
+
+		# Finish off the config
+		echo -e "${cmt2}" >> ${scratch}/arc.cf
+
+		# Move the bootloader binaries & config to their destination
+		[ -e "${1}/sashARCS" ] && mv ${1}/sashARCS ${scratch}/arcload
+		[ -e "${1}/sash64" ] && mv ${1}/sash64 ${scratch}/arcload
+		[ -e "${1}/arc.cf" ] && mv ${1}/arc.cf ${scratch}/arcload
+		;;
 esac
 exit $?


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/diskimage-stage2/, targets/support/
@ 2024-10-12 14:54 Andreas K. Hüttel
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-10-12 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     624f99730fbaf744b60fc20d097509d5ae64d13d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 14:54:27 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 14:54:27 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=624f9973

Add EFI grub installation

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/diskimage-stage2/controller.sh | 5 ++++-
 targets/support/qcow2-install-grub.sh  | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/targets/diskimage-stage2/controller.sh b/targets/diskimage-stage2/controller.sh
index 2c70642c..b676023d 100755
--- a/targets/diskimage-stage2/controller.sh
+++ b/targets/diskimage-stage2/controller.sh
@@ -24,7 +24,10 @@ case $1 in
 		# Install dracut
 		exec_in_chroot ${clst_shdir}/support/pre-distkmerge.sh
 		;;
-
+        run)
+		# We need to install grub's EFI files
+		exec_in_chroot "${clst_shdir}/support/qcow2-install-grub.sh"
+		;;
 	preclean)
 		;;
 

diff --git a/targets/support/qcow2-install-grub.sh b/targets/support/qcow2-install-grub.sh
new file mode 100755
index 00000000..75d98768
--- /dev/null
+++ b/targets/support/qcow2-install-grub.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source /tmp/chroot-functions.sh
+
+grub-install --verbose --no-floppy --efi-directory=/boot --removable --skip-fs-probe --no-nvram --no-bootsector --target=x86_64-efi || die "grub-install failed"


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/diskimage-stage2/, targets/support/
@ 2024-10-12 16:13 Andreas K. Hüttel
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-10-12 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     66d90af4a77053403c2def45fe110307b53258be
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 16:12:58 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 16:12:58 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=66d90af4

Restructure grub installation

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/diskimage-stage2/controller.sh    |  2 +-
 targets/support/create-qcow2.sh           | 34 +++++++++++++++++++++++--------
 targets/support/diskimage-installation.sh |  8 ++++++++
 targets/support/qcow2-grub-install.sh     |  7 +++++++
 targets/support/qcow2-installation.sh     |  9 --------
 5 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/targets/diskimage-stage2/controller.sh b/targets/diskimage-stage2/controller.sh
index 5dac4cc9..a904ef5a 100755
--- a/targets/diskimage-stage2/controller.sh
+++ b/targets/diskimage-stage2/controller.sh
@@ -5,7 +5,7 @@ source ${clst_shdir}/support/functions.sh
 case $1 in
         run)
 		# We need to install grub's EFI files and do very basic configuration
-		exec_in_chroot "${clst_shdir}/support/qcow2-installation.sh" || exit 1
+		exec_in_chroot "${clst_shdir}/support/diskimage-installation.sh" || exit 1
 		;;
 
 	pre-kmerge)

diff --git a/targets/support/create-qcow2.sh b/targets/support/create-qcow2.sh
index 2d100b80..b41d635a 100755
--- a/targets/support/create-qcow2.sh
+++ b/targets/support/create-qcow2.sh
@@ -49,6 +49,27 @@ qcow2die() {
 	die "$@"
 }
 
+# We need a means to execute a script inside the qcow with filesystems mounted
+exec_in_qcow2() {
+	local file_name=$(basename ${1})
+
+	# copy_to_chroot ${1}
+	cp -pPR "${1}" "${mymountpoint}/tmp" || die
+        # copy_to_chroot ${clst_shdir}/support/chroot-functions.sh
+        cp -pPR "${clst_shdir}/support/chroot-functions.sh" "${mymountpoint}/tmp" || die
+
+        # Ensure the file has the executable bit set
+        chmod +x "${mymountpoint}/tmp/${file_name}" || die
+
+        echo "Running ${file_name} in qcow2:"
+        echo "    ${clst_CHROOT} ${mymountpoint} /tmp/${file_name}"
+        ${clst_CHROOT} "${mymountpoint}" "/tmp/${file_name}" || exit 1
+
+        rm -f "${mymountpoint}/tmp/${file_name}" || die
+        rm -f "${mymountpoint}/tmp/chroot-functions.sh" || die
+}
+
+
 echo "Creating a new qcow2 disk image file ${myqcow2}.tmp.qcow2 with size ${clst_qcow2_size/%iB/}"
 qemu-img create -f qcow2 "${myqcow2}.tmp.qcow2" ${clst_qcow2_size/%iB/} || die "Cannot create qcow2 file"
 
@@ -94,7 +115,10 @@ mount ${mypartefi} "${mymountpoint}/boot" || qcow2die "Could not mount boot part
 echo "Copying files into the mounted directories from ${clst_stage_path}"
 cp -a "${clst_stage_path}"/* "${mymountpoint}/" || qcow2die "Could not copy content into mounted image"
 
-# at this point we have a working system
+# now we can chroot in and install grub
+#/usr/sbin/grub-install --verbose --no-floppy --efi-directory=/boot --removable --skip-fs-probe \
+#       --no-nvram --no-bootsector --target=x86_64-efi || die "grub-install failed"
+exec_in_qcow2 "${clst_shdir}/support/qcow2-grub-install.sh"
 
 echo "Creating a CONTENTS file ${myqcow2}.CONTENTS"
 pushd "${mymountpoint}/" &> /dev/null || qcow2die "Could not cd into mountpoint"
@@ -104,14 +128,6 @@ popd &> /dev/null                     || qcow2die "Could not cd out of mountpoin
 echo "Compressing the CONTENTS file"
 gzip "${myqcow2}.CONTENTS"      || qcow2die "Could not compress the CONTENTS file"
 
-# note: the following must already have been done by the stage2:
-# - rudimentary configuration
-# - installation of cloud-init if requested
-# - installation of kernel
-# - installation of fallback efi loader
-# - enabling of services
-# luckily efi requires no image magic, just regular files...
-
 echo "Unmounting things"
 umount "${mymountpoint}/boot" || qcow2die "Could not unmount boot partition"
 umount "${mymountpoint}" || qcow2die "Could not unmount root partition"

diff --git a/targets/support/diskimage-installation.sh b/targets/support/diskimage-installation.sh
new file mode 100755
index 00000000..8599112b
--- /dev/null
+++ b/targets/support/diskimage-installation.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+source /tmp/chroot-functions.sh
+
+# do some basic system setup here
+
+# we can't install the boot loader because nothing is mounted anywhere
+

diff --git a/targets/support/qcow2-grub-install.sh b/targets/support/qcow2-grub-install.sh
new file mode 100755
index 00000000..e1bda92b
--- /dev/null
+++ b/targets/support/qcow2-grub-install.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+source /tmp/chroot-functions.sh
+
+# install the boot loader here
+
+/bin/bash

diff --git a/targets/support/qcow2-installation.sh b/targets/support/qcow2-installation.sh
deleted file mode 100755
index 17f32aa6..00000000
--- a/targets/support/qcow2-installation.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-source /tmp/chroot-functions.sh
-
-# basic system setup
-
-# now we install grub into the future EFI partition
-/usr/sbin/grub-install --verbose --no-floppy --efi-directory=/boot --removable --skip-fs-probe \
-	--no-nvram --no-bootsector --target=x86_64-efi || die "grub-install failed"


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-10-12 16:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-05  9:08 [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/diskimage-stage2/, targets/support/ Andreas K. Hüttel
  -- strict thread matches above, loose matches on Subject: below --
2024-10-11 20:14 Andreas K. Hüttel
2024-10-12 14:54 Andreas K. Hüttel
2024-10-12 16:13 Andreas K. Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox