diff --git a/flag.go b/flag.go index f348cbf..673601d 100644 --- a/flag.go +++ b/flag.go @@ -47,7 +47,7 @@ func init() { } func init() { - methodHelpString := "Method of launching the child process, can be one of \"sudo\", \"bubblewrap\"" + methodHelpString := "Method of launching the child process, can be one of \"sudo\"" if internal.SdBootedV { methodHelpString += ", \"systemd\"" } diff --git a/internal/app/launch.bwrap.go b/internal/app/launch.bwrap.go deleted file mode 100644 index f172843..0000000 --- a/internal/app/launch.bwrap.go +++ /dev/null @@ -1,8 +0,0 @@ -package app - -// TODO: launch dbus proxy via bwrap - -func (a *app) commandBuilderBwrap() (args []string) { - // TODO: build bwrap command - panic("bwrap") -} diff --git a/internal/app/seal.go b/internal/app/seal.go index 162faf4..ffbd748 100644 --- a/internal/app/seal.go +++ b/internal/app/seal.go @@ -15,7 +15,6 @@ import ( const ( LaunchMethodSudo uint8 = iota - LaunchMethodBwrap LaunchMethodMachineCtl ) @@ -25,7 +24,6 @@ var ( ErrLaunch = errors.New("invalid launch method") ErrSudo = errors.New("sudo not available") - ErrBwrap = errors.New("bwrap not available") ErrSystemd = errors.New("systemd not available") ErrMachineCtl = errors.New("machinectl not available") ) @@ -75,13 +73,6 @@ func (a *app) Seal(config *Config) error { } else { seal.toolPath = sudoPath } - case "bubblewrap": - seal.launchOption = LaunchMethodBwrap - if bwrapPath, err := exec.LookPath("bwrap"); err != nil { - return (*LauncherLookupError)(wrapError(ErrBwrap, "bwrap not found")) - } else { - seal.toolPath = bwrapPath - } case "systemd": seal.launchOption = LaunchMethodMachineCtl if !internal.SdBootedV { diff --git a/internal/app/start.go b/internal/app/start.go index b335b68..db6c5f1 100644 --- a/internal/app/start.go +++ b/internal/app/start.go @@ -30,8 +30,6 @@ func (a *app) Start() error { switch a.seal.launchOption { case LaunchMethodSudo: commandBuilder = a.commandBuilderSudo - case LaunchMethodBwrap: - commandBuilder = a.commandBuilderBwrap case LaunchMethodMachineCtl: commandBuilder = a.commandBuilderMachineCtl default: diff --git a/nixos.nix b/nixos.nix index 5a22fee..f11e86a 100644 --- a/nixos.nix +++ b/nixos.nix @@ -148,7 +148,6 @@ in type = enum [ "simple" "sudo" - "bubblewrap" "systemd" ]; default = "systemd";