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

[Andreas K. Hüttel]

commit:     47faa99a33105e8985b0e4c2adcc7e1992be72c3
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 15:10:13 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 15:10:13 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=47faa99a

We need no bootloader action (is done at the end during qcow2 creation)

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

 catalyst/targets/diskimage_stage2.py      |  1 -
 targets/diskimage-stage2/controller.sh    |  8 --------
 targets/support/qcow2-bootloader-setup.sh | 19 -------------------
 3 files changed, 28 deletions(-)

diff --git a/catalyst/targets/diskimage_stage2.py 
b/catalyst/targets/diskimage_stage2.py
index f0e56f9e..cf7fcec5 100644
--- a/catalyst/targets/diskimage_stage2.py
+++ b/catalyst/targets/diskimage_stage2.py
@@ -100,7 +100,6 @@ class diskimage_stage2(StageBase):
         ])
         if "fetch" not in self.settings["options"]:
             self.build_sequence.extend([
-                self.bootloader,
                 self.preclean,
                 self.diskimage_update,
                 self.fsscript,

diff --git a/targets/diskimage-stage2/controller.sh 
b/targets/diskimage-stage2/controller.sh
index dace3f60..7b1aa4bd 100755
--- a/targets/diskimage-stage2/controller.sh
+++ b/targets/diskimage-stage2/controller.sh
@@ -47,14 +47,6 @@ case $1 in
        clean)
                ;;
 
-       bootloader)
-               shift
-               # We don't have to create any directories or copy any stuff 
here, since
-               # the qcow2 has no internal squashfs or similar
-
-               ${clst_shdir}/support/qcow2-bootloader-setup.sh $1
-               ;;
-
        unmerge)
                [ "${clst_diskimage_depclean}" != "no" ] && exec_in_chroot 
${clst_shdir}/support/depclean.sh
                shift

diff --git a/targets/support/qcow2-bootloader-setup.sh 
b/targets/support/qcow2-bootloader-setup.sh
deleted file mode 100755
index eb59cc52..00000000
--- a/targets/support/qcow2-bootloader-setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-source ${clst_shdir}/support/functions.sh
-
-# $1 would be the the destination root for an iso
-# ${clst_stage_path} is where the stage can be found
-
-cmdline_opts=()
-my_bootdir="${clst_stage_path}/boot"
-
-# Add any additional options
-if [ -n "${clst_diskimage_bootargs}" ]
-then
-       for x in ${clst_diskimage_bootargs}
-       do
-               cmdline_opts+=(${x})
-       done
-fi
-