tao-shen commited on
Commit
9b7279e
·
1 Parent(s): 4f8cd4a

re-enable dbus in subshell; x11vnc -nopw

Browse files
Files changed (1) hide show
  1. ubuntu-desktop/start-desktop.sh +3 -4
ubuntu-desktop/start-desktop.sh CHANGED
@@ -22,9 +22,8 @@ XVFB_PID=$!
22
  sleep 2
23
  echo "[start-desktop] After Xvfb sleep 2" >&2
24
 
25
- # Start dbus for session (optional; avoid exit on failure so noVNC can still serve)
26
- # Disabled: can trigger set -e in some envs
27
- # dbus-daemon --session 2>/dev/null || true
28
  echo "[start-desktop] Before XFCE background" >&2
29
 
30
  # Start XFCE (lightweight); use full path in case PATH is minimal
@@ -35,7 +34,7 @@ sleep 3
35
  echo "[start-desktop] XFCE started, starting x11vnc ..." >&2
36
 
37
  # x11vnc: share display :99 on port 5901 (do not exit on failure so noVNC can still start)
38
- x11vnc -display "$DISPLAY" -rfbport "$VNC_PORT" -forever -shared -noxdamage -bg || true
39
 
40
  # SSH (optional): do not let failures here stop noVNC
41
  set +e
 
22
  sleep 2
23
  echo "[start-desktop] After Xvfb sleep 2" >&2
24
 
25
+ # Start dbus for session (optional; run in subshell so failure never triggers set -e)
26
+ ( dbus-daemon --session 2>/dev/null ) || true
 
27
  echo "[start-desktop] Before XFCE background" >&2
28
 
29
  # Start XFCE (lightweight); use full path in case PATH is minimal
 
34
  echo "[start-desktop] XFCE started, starting x11vnc ..." >&2
35
 
36
  # x11vnc: share display :99 on port 5901 (do not exit on failure so noVNC can still start)
37
+ x11vnc -display "$DISPLAY" -rfbport "$VNC_PORT" -forever -shared -noxdamage -nopw -bg || true
38
 
39
  # SSH (optional): do not let failures here stop noVNC
40
  set +e