From 57f83bd4ac0c951e0b432de07e14031bf5c41d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Sj=C3=B6strom?= <lars@radicore.se>
Date: Thu, 27 Feb 2025 00:02:22 +0100
Subject: [PATCH] chore: make erofs with --all-root flag

---
 pkgs/image/default.nix  | 1 +
 pkgs/rootfs/mkrootfs.sh | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/image/default.nix b/pkgs/image/default.nix
index 553d87f..8348db4 100644
--- a/pkgs/image/default.nix
+++ b/pkgs/image/default.nix
@@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   env = {
     # vfat options won't efi won't find the fs otherwise.
     SYSTEMD_REPART_MKFS_OPTIONS_VFAT = "-S 512 -c";
+    SYSTEMD_REPART_MKFS_OPTIONS_EROFS = "--all-root";
   };
 
   systemd = patosPkgs.systemd.out;
diff --git a/pkgs/rootfs/mkrootfs.sh b/pkgs/rootfs/mkrootfs.sh
index fb9efe8..078c011 100644
--- a/pkgs/rootfs/mkrootfs.sh
+++ b/pkgs/rootfs/mkrootfs.sh
@@ -1,7 +1,8 @@
 set -ex -o pipefail
 
 ### create directory structure
-mkdir -p $out/etc/repart.d $out/dev $out/proc $out/sys $out/tmp $out/root $out/run $out/boot $out/mnt $out/home $out/srv $out/var/tmp
+mkdir -p $out/etc/repart.d $out/dev $out/proc $out/sys \
+  $out/tmp $out/root $out/run $out/boot $out/mnt $out/home $out/srv $out/var/tmp
 ln -sf /usr/bin $out/bin
 ln -sf /usr/bin $out/sbin
 ln -sf /usr/lib $out/lib
@@ -18,6 +19,7 @@ rm -f $out/usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service
 rm -f $out/usr/lib/systemd/ukify
 rm -f $out/usr/bin/ukify
 rm -f $out/usr/lib/udev/rules.d/90-vconsole.rules
+ln -s /run/systemd/resolve/stub-resolv.conf $out/etc/resolv.conf
 
 cat <<EOF > $out/etc/os-release
 NAME=PatOS