aboutsummaryrefslogtreecommitdiffhomepage
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/hakurei/print_test.go62
-rw-r--r--cmd/hpkg/app.go8
-rw-r--r--cmd/hpkg/with.go16
3 files changed, 37 insertions, 49 deletions
diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go
index d6c60ec4..2002c60e 100644
--- a/cmd/hakurei/print_test.go
+++ b/cmd/hakurei/print_test.go
@@ -51,8 +51,8 @@ Filesystem
w+ephemeral(-rwxr-xr-x):/tmp/
w*/nix/store:/mnt-root/nix/.rw-store/upper:/mnt-root/nix/.rw-store/work:/mnt-root/nix/.ro-store
*/nix/store
- */run/current-system
- */run/opengl-driver
+ &/run/current-system:*/run/current-system
+ &/run/opengl-driver:*/run/opengl-driver
w*/var/lib/hakurei/u0/org.chromium.Chromium:/data/data/org.chromium.Chromium
d+/dev/dri
@@ -128,8 +128,8 @@ Filesystem
w+ephemeral(-rwxr-xr-x):/tmp/
w*/nix/store:/mnt-root/nix/.rw-store/upper:/mnt-root/nix/.rw-store/work:/mnt-root/nix/.ro-store
*/nix/store
- */run/current-system
- */run/opengl-driver
+ &/run/current-system:*/run/current-system
+ &/run/opengl-driver:*/run/opengl-driver
w*/var/lib/hakurei/u0/org.chromium.Chromium:/data/data/org.chromium.Chromium
d+/dev/dri
@@ -310,12 +310,16 @@ App
"src": "/nix/store"
},
{
- "type": "bind",
- "src": "/run/current-system"
+ "type": "link",
+ "dst": "/run/current-system",
+ "linkname": "/run/current-system",
+ "dereference": true
},
{
- "type": "bind",
- "src": "/run/opengl-driver"
+ "type": "link",
+ "dst": "/run/opengl-driver",
+ "linkname": "/run/opengl-driver",
+ "dereference": true
},
{
"type": "bind",
@@ -329,12 +333,6 @@ App
"dev": true,
"optional": true
}
- ],
- "symlink": [
- {
- "target": "/run/user/65534",
- "linkname": "/run/user/150"
- }
]
}
},
@@ -468,12 +466,16 @@ App
"src": "/nix/store"
},
{
- "type": "bind",
- "src": "/run/current-system"
+ "type": "link",
+ "dst": "/run/current-system",
+ "linkname": "/run/current-system",
+ "dereference": true
},
{
- "type": "bind",
- "src": "/run/opengl-driver"
+ "type": "link",
+ "dst": "/run/opengl-driver",
+ "linkname": "/run/opengl-driver",
+ "dereference": true
},
{
"type": "bind",
@@ -487,12 +489,6 @@ App
"dev": true,
"optional": true
}
- ],
- "symlink": [
- {
- "target": "/run/user/65534",
- "linkname": "/run/user/150"
- }
]
}
}
@@ -680,12 +676,16 @@ func Test_printPs(t *testing.T) {
"src": "/nix/store"
},
{
- "type": "bind",
- "src": "/run/current-system"
+ "type": "link",
+ "dst": "/run/current-system",
+ "linkname": "/run/current-system",
+ "dereference": true
},
{
- "type": "bind",
- "src": "/run/opengl-driver"
+ "type": "link",
+ "dst": "/run/opengl-driver",
+ "linkname": "/run/opengl-driver",
+ "dereference": true
},
{
"type": "bind",
@@ -699,12 +699,6 @@ func Test_printPs(t *testing.T) {
"dev": true,
"optional": true
}
- ],
- "symlink": [
- {
- "target": "/run/user/65534",
- "linkname": "/run/user/150"
- }
]
}
},
diff --git a/cmd/hpkg/app.go b/cmd/hpkg/app.go
index cd548dc8..37c114c8 100644
--- a/cmd/hpkg/app.go
+++ b/cmd/hpkg/app.go
@@ -96,6 +96,9 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *container.Absolute, arg
Filesystem: []hst.FilesystemConfigJSON{
{FilesystemConfig: &hst.FSBind{Target: container.AbsFHSEtc, Source: pathSet.cacheDir.Append("etc"), Special: true}},
{FilesystemConfig: &hst.FSBind{Source: pathSet.nixPath.Append("store"), Target: pathNixStore}},
+ {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{Source: pathSet.metaPath, Target: hst.AbsTmp.Append("app")}},
{FilesystemConfig: &hst.FSBind{Source: container.AbsFHSEtc.Append("resolv.conf"), Optional: true}},
{FilesystemConfig: &hst.FSBind{Source: container.AbsFHSSys.Append("block"), Optional: true}},
@@ -104,11 +107,6 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *container.Absolute, arg
{FilesystemConfig: &hst.FSBind{Source: container.AbsFHSSys.Append("dev"), Optional: true}},
{FilesystemConfig: &hst.FSBind{Source: container.AbsFHSSys.Append("devices"), Optional: true}},
},
- Link: []hst.LinkConfig{
- {pathCurrentSystem, app.CurrentSystem.String()},
- {pathBin, pathSwBin.String()},
- {container.AbsFHSUsrBin, pathSwBin.String()},
- },
},
ExtraPerms: []*hst.ExtraPermConfig{
{Path: dataHome, Execute: true},
diff --git a/cmd/hpkg/with.go b/cmd/hpkg/with.go
index 21adeec4..03b2e5f1 100644
--- a/cmd/hpkg/with.go
+++ b/cmd/hpkg/with.go
@@ -51,11 +51,9 @@ func withNixDaemon(
Filesystem: []hst.FilesystemConfigJSON{
{FilesystemConfig: &hst.FSBind{Target: container.AbsFHSEtc, Source: pathSet.cacheDir.Append("etc"), Special: true}},
{FilesystemConfig: &hst.FSBind{Source: pathSet.nixPath, Target: pathNix, Write: true}},
- },
- Link: []hst.LinkConfig{
- {pathCurrentSystem, app.CurrentSystem.String()},
- {pathBin, pathSwBin.String()},
- {container.AbsFHSUsrBin, pathSwBin.String()},
+ {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()}},
},
},
}), dropShell, beforeFail)
@@ -90,13 +88,11 @@ func withCacheDir(
Filesystem: []hst.FilesystemConfigJSON{
{FilesystemConfig: &hst.FSBind{Target: container.AbsFHSEtc, Source: workDir.Append(container.FHSEtc), Special: true}},
{FilesystemConfig: &hst.FSBind{Source: workDir.Append("nix"), Target: pathNix}},
+ {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{Source: workDir, Target: hst.AbsTmp.Append("bundle")}},
},
- Link: []hst.LinkConfig{
- {pathCurrentSystem, app.CurrentSystem.String()},
- {pathBin, pathSwBin.String()},
- {container.AbsFHSUsrBin, pathSwBin.String()},
- },
},
}, dropShell, beforeFail)
}
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-30 01:17:10 +0000