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

["Andreas K. Hüttel" <dilfridge@gentoo.org>]

commit:     ce5750581507d233815f5efeeaf01aeb04248ed7
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 22:06:11 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 22:06:11 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ce575058

We need to add fstab late otherwise the kernel install gets confused

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

 targets/support/create-qcow2.sh           | 13 +++++++++++++
 targets/support/diskimage-installation.sh | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/targets/support/create-qcow2.sh b/targets/support/create-qcow2.sh
index d650ea91..d90ec541 100755
--- a/targets/support/create-qcow2.sh
+++ b/targets/support/create-qcow2.sh
@@ -146,6 +146,19 @@ echo "uninitialized" > "${mymountpoint}/etc/machine-id" || qcow2die "Could not s
 # now we can chroot in and install grub
 exec_in_qcow2 "${clst_shdir}/support/qcow2-grub-install.sh"
 
+echo "Generating /etc/fstab"
+cat > "${mymountpoint}/etc/fstab" <<END
+# /etc/fstab: static file system information.
+#
+# See the manpage fstab(5) for more information.
+#
+# <fs>                  <mountpoint>    <type>          <opts>          <dump/pass>
+
+LABEL=gentooroot            /               xfs              noatime,rw   0 1
+LABEL=gentooefi             /boot           vfat             defaults     1 2
+
+END
+
 echo "Creating a CONTENTS file ${myqcow2}.CONTENTS"
 pushd "${mymountpoint}/" &> /dev/null || qcow2die "Could not cd into mountpoint"
 ls -laR > "${myqcow2}.CONTENTS"       || qcow2die "Could not create CONTENTS file"

diff --git a/targets/support/diskimage-installation.sh b/targets/support/diskimage-installation.sh
index ac53cef2..fc1b7df9 100755
--- a/targets/support/diskimage-installation.sh
+++ b/targets/support/diskimage-installation.sh
@@ -16,19 +16,6 @@ if [[ $(readlink /etc/portage/make.profile) == *systemd* ]] ; then
 # generic    - an image with no means of logging in... needs postprocessing
 #              no services are started
 
-echo "Generating /etc/fstab"
-cat > /etc/fstab <<END
-# /etc/fstab: static file system information.
-#
-# See the manpage fstab(5) for more information.
-#
-# <fs>                  <mountpoint>    <type>          <opts>          <dump/pass>
-
-LABEL=gentooroot            /               xfs              noatime,rw   0 1
-LABEL=gentooefi             /boot           vfat             defaults     1 2
-
-END
-
 echo "Generating /etc/locale.gen"
 cat > /etc/locale.gen <<END
 en_US ISO-8859-1