[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/diskimage-stage2/, targets/support/

[Andreas K. Hüttel]

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"