From 0a6fc3af49b1d05134a9bfd5c1941f7de71826b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Sj=C3=B6strom?= Date: Thu, 27 Feb 2025 08:59:01 +0100 Subject: [PATCH] chore: enable default networking and make root own erofs files --- pkgs/image/default.nix | 2 +- pkgs/image/mkimage.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/image/default.nix b/pkgs/image/default.nix index 8348db4..c8b7749 100644 --- a/pkgs/image/default.nix +++ b/pkgs/image/default.nix @@ -22,7 +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_REPART_MKFS_OPTIONS_EROFS = "--all-root"; # -zlz4hc,level=12 -Efragments,dedupe,ztailpacking"; }; systemd = patosPkgs.systemd.out; diff --git a/pkgs/image/mkimage.sh b/pkgs/image/mkimage.sh index 0a7ca0b..21dbe5f 100644 --- a/pkgs/image/mkimage.sh +++ b/pkgs/image/mkimage.sh @@ -24,6 +24,8 @@ ln -sf ../dbus.socket rootfs/usr/lib/systemd/system/sockets.target.wants/dbus.so ln -sf ../systemd-networkd.service rootfs/usr/lib/systemd/system/sysinit.target.wants/systemd-networkd.service ln -sf ../systemd-resolved.service rootfs/usr/lib/systemd/system/sysinit.target.wants/systemd-resolved.service ln -sf ../systemd-timesyncd.service rootfs/usr/lib/systemd/system/multi-user.target.wants/systemd-timesyncd.service +# enable default network config +mv rootfs/usr/lib/systemd/network/89-ethernet.network.example rootfs/usr/lib/systemd/network/89-ethernet.network # generate a temporary machine id (replace with overlay later) $systemd/usr/bin/systemd-machine-id-setup --root=rootfs/