aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--helper/bwrap/config.go6
-rw-r--r--helper/bwrap/config.interface.go11
-rw-r--r--helper/bwrap/config.string.go9
3 files changed, 13 insertions, 13 deletions
diff --git a/helper/bwrap/config.go b/helper/bwrap/config.go
index c20a33b0..4163a7df 100644
--- a/helper/bwrap/config.go
+++ b/helper/bwrap/config.go
@@ -127,16 +127,16 @@ type Config struct {
// mount new procfs in sandbox
// (--proc DEST)
- Procfs []PermConfig[string] `json:"proc,omitempty"`
+ Procfs []string `json:"proc,omitempty"`
// mount new dev in sandbox
// (--dev DEST)
- DevTmpfs []PermConfig[string] `json:"dev,omitempty"`
+ DevTmpfs []string `json:"dev,omitempty"`
// mount new tmpfs in sandbox
// (--tmpfs DEST)
Tmpfs []PermConfig[TmpfsConfig] `json:"tmpfs,omitempty"`
// mount new mqueue in sandbox
// (--mqueue DEST)
- Mqueue []PermConfig[string] `json:"mqueue,omitempty"`
+ Mqueue []string `json:"mqueue,omitempty"`
// create dir in sandbox
// (--dir DEST)
Dir []PermConfig[string] `json:"dir,omitempty"`
diff --git a/helper/bwrap/config.interface.go b/helper/bwrap/config.interface.go
index eb559c1d..f68df83c 100644
--- a/helper/bwrap/config.interface.go
+++ b/helper/bwrap/config.interface.go
@@ -1,10 +1,7 @@
package bwrap
const (
- Procfs = iota
- DevTmpfs
- Tmpfs
- Mqueue
+ Tmpfs = iota
Dir
Symlink
@@ -12,10 +9,7 @@ const (
)
var interfaceArgs = func() (g [interfaceC]string) {
- g[Procfs] = "--proc"
- g[DevTmpfs] = "--dev"
g[Tmpfs] = "--tmpfs"
- g[Mqueue] = "--mqueue"
g[Dir] = "--dir"
g[Symlink] = "--symlink"
@@ -23,10 +17,7 @@ var interfaceArgs = func() (g [interfaceC]string) {
}()
func (c *Config) interfaceArgs() (g [interfaceC][]argOf) {
- g[Procfs] = copyToArgOfSlice(c.Procfs)
- g[DevTmpfs] = copyToArgOfSlice(c.DevTmpfs)
g[Tmpfs] = copyToArgOfSlice(c.Tmpfs)
- g[Mqueue] = copyToArgOfSlice(c.Mqueue)
g[Dir] = copyToArgOfSlice(c.Dir)
g[Symlink] = copyToArgOfSlice(c.Symlink)
diff --git a/helper/bwrap/config.string.go b/helper/bwrap/config.string.go
index c5c7a41e..2aa05bee 100644
--- a/helper/bwrap/config.string.go
+++ b/helper/bwrap/config.string.go
@@ -6,6 +6,9 @@ const (
UnsetEnv
LockFile
RemountRO
+ Procfs
+ DevTmpfs
+ Mqueue
stringC
)
@@ -16,6 +19,9 @@ var stringArgs = func() (n [stringC]string) {
n[UnsetEnv] = "--unsetenv"
n[LockFile] = "--lock-file"
n[RemountRO] = "--remount-ro"
+ n[Procfs] = "--proc"
+ n[DevTmpfs] = "--dev"
+ n[Mqueue] = "--mqueue"
return
}()
@@ -30,6 +36,9 @@ func (c *Config) stringArgs() (n [stringC][]string) {
n[UnsetEnv] = c.UnsetEnv
n[LockFile] = c.LockFile
n[RemountRO] = c.RemountRO
+ n[Procfs] = c.Procfs
+ n[DevTmpfs] = c.DevTmpfs
+ n[Mqueue] = c.Mqueue
return
}