diff --git a/cmd/hepto/hepto.go b/cmd/hepto/hepto.go index 999b9e32d9da5d32460fb61aff963db3aff1f661..1b6a6cf0733e2b28a44ca4e78108a5ea286358a3 100644 --- a/cmd/hepto/hepto.go +++ b/cmd/hepto/hepto.go @@ -41,7 +41,9 @@ func Hepto() error { &config.Iface, dolly.NewSystem(desiredModules, systemSettings), dolly.NewBind(dataPath, config.Cluster.DataDir), - dolly.MountSelf("/bin", "runc", "mount", "umount"), + dolly.PrefixEnv("HEPTO_"), + dolly.NewEnv("PATH", "/bin"), + dolly.MountSelf("/bin", "runc", "containerd-shim-runc-v2", "mount", "umount"), dolly.NewDevicesOrPanic(requiredDevices...), dolly.NewBinds(config.Mounts), ) diff --git a/go.mod b/go.mod index 570efe9c835fc90df9ea60b4d90dc9cfa306808f..be79c51fa9008f1b63d2d42f7fe28f3f72a6addc 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/vishvananda/netlink v1.2.1-beta.2 go.acides.org/daeman v0.3.4 - go.acides.org/dolly v0.4.2 + go.acides.org/dolly v0.4.4 go.acides.org/pekahi v0.2.1 go.acides.org/sml v0.2.2 go.etcd.io/etcd/server/v3 v3.5.9 diff --git a/go.sum b/go.sum index 0b56f01d05a20b5cd3bf227c031a36bd30797b8d..df9e3e8f33cb07f0b7355e50894f0f2951088449 100644 --- a/go.sum +++ b/go.sum @@ -1144,6 +1144,10 @@ go.acides.org/daeman v0.3.4 h1:gjKq95TpP2+IMUkW/u1do4J43Y6KhTOPwOg6BBCBT74= go.acides.org/daeman v0.3.4/go.mod h1:fOZ4YudsVjbUan8WYTs0ED6JfpZ7Z6mlN4Lnn1qW5nk= go.acides.org/dolly v0.4.2 h1:PXlNJrG4fL/OYjllvWr3MPRKe5L1sSetexNtaiWyaqw= go.acides.org/dolly v0.4.2/go.mod h1:eO56y+YmSx2h0/Zy7+p2zxNeJVl4iIWMM/vsRFMaIDM= +go.acides.org/dolly v0.4.3 h1:ktLkz8ITgtgMuyoFScJnFBUhLWbpFlNc1Cei7EhPbxE= +go.acides.org/dolly v0.4.3/go.mod h1:eO56y+YmSx2h0/Zy7+p2zxNeJVl4iIWMM/vsRFMaIDM= +go.acides.org/dolly v0.4.4 h1:TnJytd1OXZ5mDT+R0vrZYwoGPHvWP0ec7Gnhp1mQJ54= +go.acides.org/dolly v0.4.4/go.mod h1:eO56y+YmSx2h0/Zy7+p2zxNeJVl4iIWMM/vsRFMaIDM= go.acides.org/pekahi v0.2.1 h1:ysmC14q+hnYXcuB1Ew2XoWDZsgR1jbut89ACRLwi43I= go.acides.org/pekahi v0.2.1/go.mod h1:AxgN7Ss6dCRHoNOVWMymkmDafWYdDV7ce6jPl5bqyRc= go.acides.org/sml v0.2.2 h1:swwqh/MoYO/7AifuIefhfw2XeVEyXU46Uz+VtDWiDNE=