From c9facb746b7be0f2d8f6b9b2227340ba2ec12060 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 26 Aug 2025 00:52:49 +0900 Subject: hst/config: remove data field, rename dir to home There is no reason to give the home directory special treatment, as this behaviour can be quite confusing. The home directory also does not necessarily require its own mount point, it could be provided by a parent or simply be ephemeral. Signed-off-by: Ophestra --- cmd/hakurei/command.go | 2 +- cmd/hakurei/print.go | 4 ++-- cmd/hakurei/print_test.go | 13 +++++-------- cmd/hpkg/app.go | 4 ++-- cmd/hpkg/with.go | 8 ++++---- 5 files changed, 14 insertions(+), 17 deletions(-) (limited to 'cmd') diff --git a/cmd/hakurei/command.go b/cmd/hakurei/command.go index 2eee5def..d706bd21 100644 --- a/cmd/hakurei/command.go +++ b/cmd/hakurei/command.go @@ -121,7 +121,7 @@ func buildCommand(out io.Writer) command.Command { log.Fatal(err.Error()) return err } else { - config.Data = a + config.Home = a } var e system.Enablement diff --git a/cmd/hakurei/print.go b/cmd/hakurei/print.go index 20bfdde3..15798a20 100644 --- a/cmd/hakurei/print.go +++ b/cmd/hakurei/print.go @@ -81,8 +81,8 @@ func printShowInstance( if len(config.Groups) > 0 { t.Printf(" Groups:\t%s\n", strings.Join(config.Groups, ", ")) } - if config.Data != nil { - t.Printf(" Data:\t%s\n", config.Data) + if config.Home != nil { + t.Printf(" Home:\t%s\n", config.Home) } if config.Container != nil { params := config.Container diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go index 6feb681b..a0978981 100644 --- a/cmd/hakurei/print_test.go +++ b/cmd/hakurei/print_test.go @@ -39,7 +39,7 @@ func Test_printShowInstance(t *testing.T) { Identity: 9 (org.chromium.Chromium) Enablements: wayland, dbus, pulseaudio Groups: video, dialout, plugdev - Data: /var/lib/hakurei/u0/org.chromium.Chromium + Home: /data/data/org.chromium.Chromium Hostname: localhost Flags: userns devel net abstract device tty mapuid Path: /run/current-system/sw/bin/chromium @@ -116,7 +116,7 @@ App Identity: 9 (org.chromium.Chromium) Enablements: wayland, dbus, pulseaudio Groups: video, dialout, plugdev - Data: /var/lib/hakurei/u0/org.chromium.Chromium + Home: /data/data/org.chromium.Chromium Hostname: localhost Flags: userns devel net abstract device tty mapuid Path: /run/current-system/sw/bin/chromium @@ -236,8 +236,7 @@ App }, "username": "chronos", "shell": "/run/current-system/sw/bin/zsh", - "data": "/var/lib/hakurei/u0/org.chromium.Chromium", - "dir": "/data/data/org.chromium.Chromium", + "home": "/data/data/org.chromium.Chromium", "extra_perms": [ { "ensure": true, @@ -393,8 +392,7 @@ App }, "username": "chronos", "shell": "/run/current-system/sw/bin/zsh", - "data": "/var/lib/hakurei/u0/org.chromium.Chromium", - "dir": "/data/data/org.chromium.Chromium", + "home": "/data/data/org.chromium.Chromium", "extra_perms": [ { "ensure": true, @@ -604,8 +602,7 @@ func Test_printPs(t *testing.T) { }, "username": "chronos", "shell": "/run/current-system/sw/bin/zsh", - "data": "/var/lib/hakurei/u0/org.chromium.Chromium", - "dir": "/data/data/org.chromium.Chromium", + "home": "/data/data/org.chromium.Chromium", "extra_perms": [ { "ensure": true, diff --git a/cmd/hpkg/app.go b/cmd/hpkg/app.go index 37c114c8..5fd5e640 100644 --- a/cmd/hpkg/app.go +++ b/cmd/hpkg/app.go @@ -78,8 +78,7 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *container.Absolute, arg Username: "hakurei", Shell: pathShell, - Data: pathSet.homeDir, - Dir: pathDataData.Append(app.ID), + Home: pathDataData.Append(app.ID), Identity: app.Identity, Groups: app.Groups, @@ -106,6 +105,7 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *container.Absolute, arg {FilesystemConfig: &hst.FSBind{Source: container.AbsFHSSys.Append("class"), Optional: true}}, {FilesystemConfig: &hst.FSBind{Source: container.AbsFHSSys.Append("dev"), Optional: true}}, {FilesystemConfig: &hst.FSBind{Source: container.AbsFHSSys.Append("devices"), Optional: true}}, + {FilesystemConfig: &hst.FSBind{Target: pathDataData.Append(app.ID), Source: pathSet.homeDir, Write: true, Ensure: true}}, }, }, ExtraPerms: []*hst.ExtraPermConfig{ diff --git a/cmd/hpkg/with.go b/cmd/hpkg/with.go index 03b2e5f1..1895a06f 100644 --- a/cmd/hpkg/with.go +++ b/cmd/hpkg/with.go @@ -33,8 +33,7 @@ func withNixDaemon( Username: "hakurei", Shell: pathShell, - Data: pathSet.homeDir, - Dir: pathDataData.Append(app.ID), + Home: pathDataData.Append(app.ID), ExtraPerms: []*hst.ExtraPermConfig{ {Path: dataHome, Execute: true}, {Ensure: true, Path: pathSet.baseDir, Read: true, Write: true, Execute: true}, @@ -54,6 +53,7 @@ func withNixDaemon( {FilesystemConfig: &hst.FSLink{Target: pathCurrentSystem, Linkname: app.CurrentSystem.String()}}, {FilesystemConfig: &hst.FSLink{Target: pathBin, Linkname: pathSwBin.String()}}, {FilesystemConfig: &hst.FSLink{Target: container.AbsFHSUsrBin, Linkname: pathSwBin.String()}}, + {FilesystemConfig: &hst.FSBind{Target: pathDataData.Append(app.ID), Source: pathSet.homeDir, Write: true, Ensure: true}}, }, }, }), dropShell, beforeFail) @@ -71,8 +71,7 @@ func withCacheDir( Username: "nixos", Shell: pathShell, - Data: pathSet.cacheDir, // this also ensures cacheDir via shim - Dir: pathDataData.Append(app.ID, "cache"), + Home: pathDataData.Append(app.ID, "cache"), ExtraPerms: []*hst.ExtraPermConfig{ {Path: dataHome, Execute: true}, {Ensure: true, Path: pathSet.baseDir, Read: true, Write: true, Execute: true}, @@ -92,6 +91,7 @@ func withCacheDir( {FilesystemConfig: &hst.FSLink{Target: pathBin, Linkname: pathSwBin.String()}}, {FilesystemConfig: &hst.FSLink{Target: container.AbsFHSUsrBin, Linkname: pathSwBin.String()}}, {FilesystemConfig: &hst.FSBind{Source: workDir, Target: hst.AbsTmp.Append("bundle")}}, + {FilesystemConfig: &hst.FSBind{Target: pathDataData.Append(app.ID, "cache"), Source: pathSet.cacheDir, Write: true, Ensure: true}}, }, }, }, dropShell, beforeFail) -- cgit v1.3.1