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 --- cmd/hakurei/print.go | 4 ---- cmd/hakurei/print_test.go | 34 ++++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 18 deletions(-) (limited to 'cmd') diff --git a/cmd/hakurei/print.go b/cmd/hakurei/print.go index 807831c4..1169d10f 100644 --- a/cmd/hakurei/print.go +++ b/cmd/hakurei/print.go @@ -114,10 +114,6 @@ func printShowInstance( } t.Printf(" Etc:\t%s\n", etc) - if len(container.Cover) > 0 { - t.Printf(" Cover:\t%s\n", strings.Join(container.Cover, " ")) - } - t.Printf(" Path:\t%s\n", config.Path) } if len(config.Args) > 0 { diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go index 7979fb65..0a4e91ba 100644 --- a/cmd/hakurei/print_test.go +++ b/cmd/hakurei/print_test.go @@ -44,11 +44,11 @@ func Test_printShowInstance(t *testing.T) { Flags: userns devel net device tty mapuid autoetc Root: /var/lib/hakurei/base/org.debian (2) Etc: /etc - Cover: /var/run/nscd Path: /run/current-system/sw/bin/chromium Arguments: chromium --ignore-gpu-blocklist --disable-smooth-scrolling --enable-features=UseOzonePlatform --ozone-platform=wayland Filesystem + w+tmpfs:/tmp +/nix/store +/run/current-system +/run/opengl-driver @@ -124,11 +124,11 @@ App Flags: userns devel net device tty mapuid autoetc Root: /var/lib/hakurei/base/org.debian (2) Etc: /etc - Cover: /var/run/nscd Path: /run/current-system/sw/bin/chromium Arguments: chromium --ignore-gpu-blocklist --disable-smooth-scrolling --enable-features=UseOzonePlatform --ozone-platform=wayland Filesystem + w+tmpfs:/tmp +/nix/store +/run/current-system +/run/opengl-driver @@ -275,6 +275,11 @@ App "map_real_uid": true, "device": true, "filesystem": [ + { + "dst": "/tmp", + "src": "tmpfs", + "write": true + }, { "src": "/nix/store" }, @@ -307,10 +312,7 @@ App "auto_root": "/var/lib/hakurei/base/org.debian", "root_flags": 2, "etc": "/etc", - "auto_etc": true, - "cover": [ - "/var/run/nscd" - ] + "auto_etc": true } }, "time": "1970-01-01T00:00:00.000000009Z" @@ -405,6 +407,11 @@ App "map_real_uid": true, "device": true, "filesystem": [ + { + "dst": "/tmp", + "src": "tmpfs", + "write": true + }, { "src": "/nix/store" }, @@ -437,10 +444,7 @@ App "auto_root": "/var/lib/hakurei/base/org.debian", "root_flags": 2, "etc": "/etc", - "auto_etc": true, - "cover": [ - "/var/run/nscd" - ] + "auto_etc": true } } `}, @@ -589,6 +593,11 @@ func Test_printPs(t *testing.T) { "map_real_uid": true, "device": true, "filesystem": [ + { + "dst": "/tmp", + "src": "tmpfs", + "write": true + }, { "src": "/nix/store" }, @@ -621,10 +630,7 @@ func Test_printPs(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 } }, "time": "1970-01-01T00:00:00.000000009Z" -- cgit v1.3.1