From b32b1975a89d60beab75dfca723925131a06065b Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 2 Aug 2025 00:34:52 +0900 Subject: hst/container: remove cover This was never useful, and is now completely replaced by regular FilesystemConfig being able to mount tmpfs. Signed-off-by: Ophestra --- hst/container.go | 3 --- hst/template.go | 2 +- hst/template_test.go | 10 ++++++---- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'hst') diff --git a/hst/container.go b/hst/container.go index 9ca14a8b..ebce07b9 100644 --- a/hst/container.go +++ b/hst/container.go @@ -69,9 +69,6 @@ type ( Etc string `json:"etc,omitempty"` // automatically set up /etc symlinks AutoEtc bool `json:"auto_etc"` - - // cover these paths or create them if they do not already exist - Cover []string `json:"cover"` } // FilesystemConfig is an abstract representation of a bind mount. diff --git a/hst/template.go b/hst/template.go index 391e58e2..5758462e 100644 --- a/hst/template.go +++ b/hst/template.go @@ -78,6 +78,7 @@ func Template() *Config { "GOOGLE_DEFAULT_CLIENT_SECRET": "OTJgUOQcT7lO7GsGZq2G4IlT", }, Filesystem: []*FilesystemConfig{ + {Dst: "/tmp", Src: SourceTmpfs, Write: true}, {Src: "/nix/store"}, {Src: "/run/current-system"}, {Src: "/run/opengl-driver"}, @@ -91,7 +92,6 @@ func Template() *Config { RootFlags: container.BindWritable, Etc: "/etc", AutoEtc: true, - Cover: []string{"/var/run/nscd"}, }, } } diff --git a/hst/template_test.go b/hst/template_test.go index 7f0caa7d..02ec7748 100644 --- a/hst/template_test.go +++ b/hst/template_test.go @@ -97,6 +97,11 @@ func TestTemplate(t *testing.T) { "map_real_uid": true, "device": true, "filesystem": [ + { + "dst": "/tmp", + "src": "tmpfs", + "write": true + }, { "src": "/nix/store" }, @@ -129,10 +134,7 @@ func TestTemplate(t *testing.T) { "auto_root": "/var/lib/hakurei/base/org.debian", "root_flags": 2, "etc": "/etc", - "auto_etc": true, - "cover": [ - "/var/run/nscd" - ] + "auto_etc": true } }` -- cgit v1.3.1