commit: 05dc5bb921536d326029ec025047ce9f6a82caa0 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sat Oct 12 19:01:38 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sat Oct 12 19:01:38 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=05dc5bb9
Remove underscore and add debug output Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> targets/support/create-qcow2.sh | 7 +++++-- targets/support/diskimage-installation.sh | 1 + targets/support/qcow2-bootloader-setup.sh | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/targets/support/create-qcow2.sh b/targets/support/create-qcow2.sh index 06e1ec39..9bee8906 100755 --- a/targets/support/create-qcow2.sh +++ b/targets/support/create-qcow2.sh @@ -102,14 +102,14 @@ echo "Creating a GPT disklabel" parted -s ${mydevice} mklabel gpt || qcow2die "Cannot create disklabel" echo "Creating an EFI boot partition" -parted -s ${mydevice} -- mkpart gentoo_efi fat32 1M ${clst_qcow2_efisize} || qcow2die "Cannot create EFI partition" +parted -s ${mydevice} -- mkpart gentooefi fat32 1M ${clst_qcow2_efisize} || qcow2die "Cannot create EFI partition" # mark it as EFI boot partition parted -s ${mydevice} -- type 1 C12A7328-F81F-11D2-BA4B-00A0C93EC93B || qcow2die "Cannot set EFI partition UUID" # note down name mypartefi=${mydevice}p1 echo "Creating the root partition" -parted -s ${mydevice} -- mkpart gentoo_root ${clst_qcow2_roottype} ${clst_qcow2_efisize}GiB -1M || qcow2die "Cannot create root partition" +parted -s ${mydevice} -- mkpart gentooroot ${clst_qcow2_roottype} ${clst_qcow2_efisize}GiB -1M || qcow2die "Cannot create root partition" # mark it as generic linux filesystem partition parted -s ${mydevice} -- type 2 0FC63DAF-8483-4772-8E79-3D69D8477DE4 || qcow2die "Cannot set root partition UUID" # note down name @@ -127,6 +127,9 @@ mkfs.fat -v -F 32 ${mypartefi} || qcow2die "Formatting EFI partition failed" echo "Making an xfs filesystem in p2" mkfs.xfs ${mypartroot} || qcow2die "Formatting root partition failed" +echo "Printing blkid output" +blkid ${mydevice} || qcow2die "blkid failed" + echo "Mounting things at ${mymountpoint}" mkdir -p "${mymountpoint}" || qcow2die "Could not create root mount point" mount ${mypartroot} "${mymountpoint}" || qcow2die "Could not mount root partition" diff --git a/targets/support/diskimage-installation.sh b/targets/support/diskimage-installation.sh index 6293c04d..7abe62fb 100755 --- a/targets/support/diskimage-installation.sh +++ b/targets/support/diskimage-installation.sh @@ -22,6 +22,7 @@ systemctl preset-all || die "Running systemctl preset-all failed" # Provide configuration for systemd-firstboot # We need enough information so all questions are skipped +mkdir -p /etc/systemd/system/systemd-firstboot.service.d || die "mkdir failed" mysfconfigfile=/etc/systemd/system/systemd-firstboot.service.d/00gentoo.conf mysfconfig_console=$(cat <<END diff --git a/targets/support/qcow2-bootloader-setup.sh b/targets/support/qcow2-bootloader-setup.sh index 2bf6d873..ff338126 100755 --- a/targets/support/qcow2-bootloader-setup.sh +++ b/targets/support/qcow2-bootloader-setup.sh @@ -41,7 +41,7 @@ memtest_grub() { } default_append_line=(${cmdline_opts[@]}) -default_dracut_append_line=(${clst_diskimage_bootargs} 'root="LABEL=gentoo_root"') +default_dracut_append_line=(${clst_diskimage_bootargs} 'root="LABEL=gentooroot"') case ${clst_hostarch} in amd64|arm64|ppc*) @@ -60,7 +60,7 @@ case ${clst_hostarch} in echo "menuentry 'Gentoo Linux (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg} if [ ${distkernel} = "yes" ] then - echo " search --no-floppy --set=root -l gentoo_efi" >> ${iacfg} + echo " search --no-floppy --set=root -l gentooefi" >> ${iacfg} echo " linux /${x} ${default_dracut_append_line[@]}" >> ${iacfg} else echo " linux /${x} ${default_append_line[@]}" >> ${iacfg}