sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-21 12:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Collapse X11 DISPLAY/XAUTHORITY auto-detect logs into one line

Browse Source
This commit is contained in:
Viktor Liu
2026-05-20 15:36:26 +02:00
parent 896530fd82
commit 517bea0daf
21 changed files with 131 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vnc/server/virtual_x11.go
+3 -3
View File
@@ -118,7 +118,7 @@ func (vs *VirtualSession) start() error {
return err
}
socketPath := fmt.Sprintf("/tmp/.X11-unix/X%s", vs.display[1:])
socketPath := fmt.Sprintf("%s/X%s", x11SocketDir, vs.display[1:])
if err := waitForPath(socketPath, 5*time.Second); err != nil {
vs.stopXvfb()
return fmt.Errorf("wait for X11 socket %s: %w", socketPath, err)
@@ -196,7 +196,7 @@ func (vs *VirtualSession) isAlive() bool {
return false
}
// Verify the X socket still exists on disk.
socketPath := fmt.Sprintf("/tmp/.X11-unix/X%s", display[1:])
socketPath := fmt.Sprintf("%s/X%s", x11SocketDir, display[1:])
if _, err := os.Stat(socketPath); err != nil {
return false
}
@@ -590,7 +590,7 @@ func bestSessionCandidate(candidates []sessionCandidate) sessionCandidate {
func findFreeDisplay() (string, error) {
for n := 50; n < 200; n++ {
lockFile := fmt.Sprintf("/tmp/.X%d-lock", n)
socketFile := fmt.Sprintf("/tmp/.X11-unix/X%d", n)
socketFile := fmt.Sprintf("%s/X%d", x11SocketDir, n)
if _, err := os.Stat(lockFile); err == nil {
continue
}