Merge pull request #49 from sorenisanerd/dev

Merge dev branch

Author: sorenisanerd

.gitignore

@@ -11,3 +11,4 @@
 /*.acast
 mkosi.local
 mkosi.local.conf
+/*.log

mkosi.bios.finalize

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+kver=$(basename ${BUILDROOT}/usr/lib/modules/*)
+initrd=$(basename $(jq -C .Initrds[0] < ${MKOSI_CONFIG} -r))
+
+# Use IMAGE_VERSION for kernel's filename. Blame sd-sysupdate.
+mv ${BUILDROOT}/boot/mangos/${kver}/vmlinuz ${BUILDROOT}/boot/mangos-${IMAGE_VERSION}.vmlinuz
+
+# Combine microcode and initrd and call it a day
+cat ${BUILDROOT}/boot/mangos/microcode.initrd ${BUILDROOT}/boot/mangos/${initrd} > ${BUILDROOT}/boot/mangos-${IMAGE_VERSION}.initrd
+
+# There's so much extra stuff in /boot we don't need. 
+rm -rf ${BUILDROOT}/boot/mangos/microcode.initrd ${BUILDROOT}/boot/mangos/${initrd} ${BUILDROOT}/boot/vmlinuz-* ${BUILDROOT}/boot/mangos/${kver}
+
+# Menuentries in grub.cfg have with the kernel version in their id by default.
+# Since our entries often use the same kernel (but different roothash), we put
+# the IMAGE_VERSION in the menuentry id instead.
+# Also accomodate the renamed kernel and initrd.
+# Finally, add \${kernel_args} to the linux line.
+sed -e 's/menuentry.*"/menuentry "mangos-'${IMAGE_VERSION}'"/g' \
+    -e 's@^[      ]*linux [^ ]*@    linux /mangos-'${IMAGE_VERSION}'.vmlinuz@g' \
+    -e 's@^[      ]*linux .*@& ${kernel_args}@' \
+    -e 's@^[      ]*initrd .*@    initrd /mangos-'${IMAGE_VERSION}'.initrd@' \
+    -i ${BUILDROOT}/efi/grub/grub.cfg
+
+cp ${BUILDROOT}/efi/grub/grub.cfg ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.grub.cfg
+

mkosi.conf

@@ -54,6 +54,9 @@ Bootable=yes
 Bootloader=systemd-boot
 KernelModulesInitrd=yes
 
+# 2025-06-01 00:00:00
+SourceDateEpoch=1757490000
+
 [Validation]
 Checksum=yes
 SecureBoot=yes
@@ -72,3 +75,4 @@ Ephemeral=yes
 RAM=4G
 CPUs=2
 VSock=yes
+RuntimeScratch=no

mkosi.images/base/mkosi.extra/usr/lib/repart.notpm.d/30-swap.conf

@@ -0,0 +1,7 @@
+[Partition]
+Type=swap
+Format=swap
+SizeMinBytes=4G
+SizeMaxBytes=4G
+FactoryReset=on
+

mkosi.images/base/mkosi.extra/usr/lib/repart.notpm.d/40-var-tmp.conf

@@ -0,0 +1,5 @@
+[Partition]
+Type=tmp
+Format=xfs
+SizeMinBytes=5G
+FactoryReset=on

mkosi.images/base/mkosi.extra/usr/lib/repart.notpm.d/50-var.conf

@@ -0,0 +1,6 @@
+[Partition]
+Type=var
+Format=xfs
+SizeMinBytes=2G
+FactoryReset=on
+MakeDirectories=/log/journal /tmp /lib/extensions /lib/extensions.available

mkosi.images/debug/mkosi.conf

@@ -0,0 +1,10 @@
+[Output]
+Overlay=true
+Format=sysext
+
+[Config]
+Dependencies=base
+
+[Content]
+BaseTrees=%O/base_%v
+Packages=strace

mkosi.images/docker/mkosi.conf

@@ -12,3 +12,6 @@ PostInstallationScripts=%D/resources/augment-os-release
 [Output]
 Format=sysext
 Overlay=yes
+
+[Validation]
+Checksum=yes

mkosi.images/initrd/mkosi.extra/usr/lib/mangos/mangos-install

@@ -1,12 +1,6 @@
 #!/bin/sh
 
-DOWNLOAD_URL="$(systemd-creds cat mangos_install_source 2> /dev/null)"
-
-if [ -z "${KERNEL_CMDLINE}" ]
-then
-    KERNEL_CMDLINE="$(cat /proc/cmdline)"
-fi
-
+install_source="$(systemd-creds cat mangos_install_source 2> /dev/null)"
 install_target="$(systemd-creds cat mangos_install_target 2> /dev/null)"
 
 while [ $# -gt 0 ]
@@ -22,7 +16,7 @@ do
             exit 0
             ;;
         -s)
-            DOWNLOAD_URL="$2"
+            install_source="$2"
             shift 2
             ;;
         -n|--dry-run)
@@ -38,7 +32,7 @@ done
 
 if [ -z "${install_target}" ]
 then
-    target="$(sed -e 's%.*mangos_install_target=\([a-z0-9/:.-]\+\).*%\1%' /proc/cmdline)"
+    target="$(sed -e 's%.*mangos_install_target=\([^ ]\+\).*%\1%' /proc/cmdline)"
     if [ -n "${target}" ]
     then
         install_target="${target}"
@@ -49,22 +43,31 @@ install_target="${install_target:-ask}"
 
 if [ "${install_target}" = "ask" ]
 then
-        if ! lsblk -p -o TYPE,NAME,VENDOR,MODEL,SERIAL -l | grep ^disk | cut -f2- -d' ' | sed -e 's/ \+/ /g' | while read bdev info; do /bin/echo -e "$bdev\0$info\0" ; done | tr -d '\n' | xargs -0 whiptail --menu "Install target" 15 50 0 2> /tmp/mangos_install_target
+        if ! lsblk -p -o TYPE,NAME,SIZE,VENDOR,MODEL,SERIAL -l | grep ^disk | cut -f2- -d' ' | sed -e 's/ \+/ /g' | while read bdev info; do /bin/echo -e "$bdev\x00$info\x00" ; done | tr -d '\n' | xargs -0 whiptail --menu "Install target" 15 50 0 2> /tmp/mangos_install_target
         then
                 echo "Install cancelled"
                 exit 1
         fi
         install_target="$(cat /tmp/mangos_install_target ; rm /tmp/mangos_install_target)"
 fi
 
-if [ -z "${DOWNLOAD_URL}" ]
+if [ -z "${install_source}" ]
+then
+    source="$(sed -e 's%.*mangos_install_source=\([^ ]\+\).*%\1%' /proc/cmdline)"
+    if [ -n "${source}" ]
+    then
+        install_source="${source}"
+    fi
+fi
+
+if [ -z "${install_source}" ]
 then
     . /etc/os-release
 
-    DOWNLOAD_URL="${MANGOS_GITHUB_URL}/releases/download/v${IMAGE_VERSION}/mangos_${IMAGE_VERSION}.raw.zst"
+    install_source="${MANGOS_GITHUB_URL}/releases/download/v${IMAGE_VERSION}/mangos_${IMAGE_VERSION}.raw.zst"
 fi
 
-$echo /usr/lib/systemd/systemd-pull --force --verify=no --roothash=no --verity=no --direct raw "${DOWNLOAD_URL}" "$install_target"
+$echo /usr/lib/systemd/systemd-pull --force --verify=no --roothash=no --verity=no --direct raw "${install_source}" "$install_target"
 
 $echo sgdisk -p "${install_target}"
 $echo sgdisk -v "${install_target}"
@@ -83,8 +86,17 @@ sync ; sync
 
 mount "${install_target}5" /mnt
 mount "${install_target}1" /mnt/boot
+
+# Add ip= kernel arg to grub config
+ip_arg="$(grep -oE 'ip=[^ ]+' /proc/cmdline)"
+nameserver_arg="$(grep -oE 'nameserver=[^ ]+' /proc/cmdline)"
+
+sed -e "s%^.*linux .*%& ${ip_arg} ${nameserver_arg}%g" -i /mnt/boot/grub/grub.cfg
+
 touch /dev/shm/entry-token
 mount -o bind /dev/shm/entry-token /mnt/etc/kernel/entry-token
 bootctl install --root=/mnt --variables=yes
 umount /mnt/etc/kernel/entry-token
+umount /mnt/boot
+umount /mnt
 sync ; sync

mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system-generators/mangos-installer-generator

@@ -22,7 +22,7 @@ then
         exit 0
 fi
 
-unit="$(systemd-escape ${target}).device"
+unit="$(systemd-escape ${target#/}).device"
 
 mkdir -p "${outdir}/mangos-install.service.d"