From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BFF90158046 for ; Sat, 12 Oct 2024 22:06:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 108CFE079C; Sat, 12 Oct 2024 22:06:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0475E079C for ; Sat, 12 Oct 2024 22:06:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B9D934305F for ; Sat, 12 Oct 2024 22:06:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87BD21A4D for ; Sat, 12 Oct 2024 22:06:35 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1728770771.ce5750581507d233815f5efeeaf01aeb04248ed7.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/create-qcow2.sh targets/support/diskimage-installation.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: ce5750581507d233815f5efeeaf01aeb04248ed7 X-VCS-Branch: dilfridge/qcow2 Date: Sat, 12 Oct 2024 22:06:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e4949622-05bf-424d-97bb-93a14e8d5929 X-Archives-Hash: 722e0abdb585cf4e61414481a724d757 commit: ce5750581507d233815f5efeeaf01aeb04248ed7 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Oct 12 22:06:11 2024 +0000 Commit: Andreas K. Hüttel gentoo 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 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" < + +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 < - -LABEL=gentooroot / xfs noatime,rw 0 1 -LABEL=gentooefi /boot vfat defaults 1 2 - -END - echo "Generating /etc/locale.gen" cat > /etc/locale.gen <