Merge pull request #3898 from norio-nomura/use-go-diskfs#296

Use diskfs/go-diskfs#296

Author: jandubois

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/coreos/go-semver v0.3.1
 	github.com/cpuguy83/go-md2man/v2 v2.0.7
 	github.com/digitalocean/go-qemu v0.0.0-20221209210016-f035778c97f7
-	github.com/diskfs/go-diskfs v1.6.0 // gomodjail:unconfined
+	github.com/diskfs/go-diskfs v1.6.1-0.20250518130040-b3152784dab9 // gomodjail:unconfined
 	github.com/docker/go-units v0.5.0
 	github.com/elastic/go-libaudit/v2 v2.6.2
 	github.com/foxcpp/go-mockdns v1.1.0

go.sum

@@ -55,8 +55,8 @@ github.com/digitalocean/go-qemu v0.0.0-20221209210016-f035778c97f7 h1:3OVJAbR131
 github.com/digitalocean/go-qemu v0.0.0-20221209210016-f035778c97f7/go.mod h1:K4+o74YGNjOb9N6yyG+LPj1NjHtk+Qz0IYQPvirbaLs=
 github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
-github.com/diskfs/go-diskfs v1.6.0 h1:YmK5+vLSfkwC6kKKRTRPGaDGNF+Xh8FXeiNHwryDfu4=
-github.com/diskfs/go-diskfs v1.6.0/go.mod h1:bRFumZeGFCO8C2KNswrQeuj2m1WCVr4Ms5IjWMczMDk=
+github.com/diskfs/go-diskfs v1.6.1-0.20250518130040-b3152784dab9 h1:pykEg46HBYZmfmnaHj5qxXBuZRGGh6pG8XIqcBD2M9E=
+github.com/diskfs/go-diskfs v1.6.1-0.20250518130040-b3152784dab9/go.mod h1:bRFumZeGFCO8C2KNswrQeuj2m1WCVr4Ms5IjWMczMDk=
 github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c=
 github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0=
 github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=

hack/test-templates.sh

@@ -205,8 +205,7 @@ if [[ -n ${CHECKS["param-env-variables"]} ]]; then
 	limactl shell "$NAME" test -e /tmp/param-dependency
 	limactl shell "$NAME" test -e /tmp/param-probe
 	limactl shell "$NAME" test -e /tmp/param-system
-	# TODO re-enable once https://github.com/lima-vm/lima/issues/3308 is fixed
-	# limactl shell "$NAME" test -e /tmp/param-user
+	limactl shell "$NAME" test -e /tmp/param-user
 fi
 
 if [[ -n ${CHECKS["set-user"]} ]]; then

hack/test-templates/test-misc.yaml

@@ -19,8 +19,7 @@ param:
   DEPENDENCY: dependency
   PROBE: probe
   SYSTEM: system
-# TODO re-enable once https://github.com/lima-vm/lima/issues/3308 is fixed
-# USER: user
+  USER: user
 
 provision:
 - mode: ansible
@@ -31,9 +30,8 @@ provision:
   script: "touch /tmp/param-$PARAM_DEPENDENCY"
 - mode: system
   script: "touch /tmp/param-$PARAM_SYSTEM"
-# TODO re-enable once https://github.com/lima-vm/lima/issues/3308 is fixed
-# - mode: user
-#   script: "touch /tmp/param-$PARAM_USER"
+- mode: user
+  script: "touch /tmp/param-$PARAM_USER"
 - mode: data
   path: /etc/sysctl.d/99-inotify.conf
   content: |