From b785e594f3f6212e0b3998416d14d8d3b385f686 Mon Sep 17 00:00:00 2001
From: Andrew Kidd <contact@andrewiankidd.co.uk>
Date: Fri, 3 Jan 2025 12:10:40 +0000
Subject: [PATCH] rework rootfs output dir

---
 net-image/net-image.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-image/net-image.nix b/net-image/net-image.nix
index 72f068f..8716ee8 100644
--- a/net-image/net-image.nix
+++ b/net-image/net-image.nix
@@ -123,14 +123,14 @@ in
             set -e
             set -x
             mkdir -p $out/nix-support $out/net-image
-            export rootfs=$out/net-image/${config.netImage.rootDirectoryName}
+            export rootfs=$out/net-image/os/${config.netImage.rootDirectoryName}
             export bootfs=$out/net-image/boot
 
             echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system
 
             echo "Exporting rootfs image"
             mkdir -p $rootfs
-            cp -r ${rootfsImage} $rootfs
+            cp -r ${rootfsImage}/* $rootfs
 
             # Populate the files intended for tftp
             ${config.netImage.populateFirmwareCommands}