aboutsummaryrefslogtreecommitdiffhomepage
path: root/internal/app/launch.machinectl.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/app/launch.machinectl.go')
-rw-r--r--internal/app/launch.machinectl.go11
1 files changed, 1 insertions, 10 deletions
diff --git a/internal/app/launch.machinectl.go b/internal/app/launch.machinectl.go
index 9fb9ea0b..606fd9d5 100644
--- a/internal/app/launch.machinectl.go
+++ b/internal/app/launch.machinectl.go
@@ -4,7 +4,6 @@ import (
"os/exec"
"strings"
- "git.ophivana.moe/cat/fortify/internal/state"
"git.ophivana.moe/cat/fortify/internal/verbose"
)
@@ -12,7 +11,7 @@ func (a *app) commandBuilderMachineCtl(shimEnv string) (args []string) {
args = make([]string, 0, 9+len(a.seal.sys.bwrap.SetEnv))
// shell --uid=$USER
- args = append(args, "shell", "--uid="+a.seal.sys.Username)
+ args = append(args, "shell", "--uid="+a.seal.sys.user.Username)
// --quiet
if !verbose.Get() {
@@ -49,14 +48,6 @@ func (a *app) commandBuilderMachineCtl(shimEnv string) (args []string) {
}
innerCommand.WriteString("; ")
- // override message bus address if enabled
- if a.seal.et.Has(state.EnableDBus) {
- innerCommand.WriteString(dbusSessionBusAddress + "=" + "'" + "unix:path=" + a.seal.sys.dbusAddr[0][1] + "' ")
- if a.seal.sys.dbusSystem {
- innerCommand.WriteString(dbusSystemBusAddress + "=" + "'" + "unix:path=" + a.seal.sys.dbusAddr[1][1] + "' ")
- }
- }
-
// launch fortify as shim
innerCommand.WriteString("exec " + a.seal.sys.executable + " shim")