File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -97,17 +97,14 @@ vncserver -kill $DISPLAY &> $STARTUPDIR/vnc_startup.log \
9797
9898echo -e " start vncserver with param: VNC_COL_DEPTH=$VNC_COL_DEPTH , VNC_RESOLUTION=$VNC_RESOLUTION \n..."
9999
100- vnc_cmd=" vncserver $DISPLAY -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION PasswordFile=$HOME /.vnc/passwd"
100+ vnc_cmd=" vncserver $DISPLAY -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION PasswordFile=$HOME /.vnc/passwd -xstartup $HOME /wm_startup.sh "
101101if [[ ${VNC_PASSWORDLESS:- } == " true" ]]; then
102102 vnc_cmd=" ${vnc_cmd} -SecurityTypes None --I-KNOW-THIS-IS-INSECURE"
103103fi
104104
105105if [[ $DEBUG == true ]]; then echo " $vnc_cmd " ; fi
106106$vnc_cmd > $STARTUPDIR /no_vnc_startup.log 2>&1
107107
108- echo -e " start window manager\n..."
109- $HOME /wm_startup.sh & > $STARTUPDIR /wm_startup.log
110-
111108# # log connect options
112109echo -e " \n\n------------------ VNC environment started ------------------"
113110echo -e " \nVNCSERVER started on DISPLAY= $DISPLAY \n\t=> connect via VNC viewer with $VNC_IP :$VNC_PORT "
@@ -117,7 +114,7 @@ echo -e "\nnoVNC HTML client started:\n\t=> connect via http://$VNC_IP:$NO_VNC_P
117114if [[ $DEBUG == true ]] || [[ $1 =~ -t | --tail-log ]]; then
118115 echo -e " \n------------------ $HOME /.vnc/*$DISPLAY .log ------------------"
119116 # if option `-t` or `--tail-log` block the execution and tail the VNC log
120- tail -f $STARTUPDIR /* .log $HOME /.vnc/* $DISPLAY .log
117+ tail -f $STARTUPDIR /* .log $HOME /.vnc/* $DISPLAY .log $HOME /wm.log
121118fi
122119
123120if [ -z " $1 " ] || [[ $1 =~ -w | --wait ]]; then
Original file line number Diff line number Diff line change @@ -9,6 +9,4 @@ xset -dpms &
99xset s noblank &
1010xset s off &
1111
12- /usr/bin/startxfce4 --replace > $HOME /wm.log &
13- sleep 1
14- cat $HOME /wm.log
12+ /usr/bin/startxfce4 --replace > $HOME /wm.log
You can’t perform that action at this time.
0 commit comments