Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Allow Orbit shell to run while daemon is running (#4772)

Browse source 
Use a different data path so that the new osquery instance doesn't try
to use the same pidfile, db file, extension socket, etc.

#4769
This commit is contained in:
Zach Wasserman 2022-03-23 15:27:52 -07:00 committed by GitHub
parent c4946335ff
commit d0630b00e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
orbit/changes/fix-shell Normal file
View file

@ -0,0 +1 @@
* Fix `orbit shell` command to successfully run when Orbit is already running as daemon.

2
orbit/cmd/orbit/shell.go
View file

@ -80,7 +80,7 @@ var shellCommand = &cli.Command{
r, _ := osquery.NewRunner( r, _ := osquery.NewRunner(
osquerydPath, osquerydPath,
osquery.WithShell(), osquery.WithShell(),
osquery.WithDataPath(c.String("root-dir")), osquery.WithDataPath(filepath.Join(c.String("root-dir"), "shell")),
// Handle additional args after -- // Handle additional args after --
osquery.WithFlags(c.Args().Slice()), osquery.WithFlags(c.Args().Slice()),
) )