freenx-dimbor-git/nxnode.diff

   1 --- nxnode.old  2010-12-14 02:24:52.000000000 +0300
   2 +++ nxnode      2010-12-15 01:40:27.000000000 +0300
   3 @@ -1531,6 +1531,10 @@
   4
   5  node_start_monitor()
   6  {
   7 +#oldbay//
   8 +# wait timeout for start suspend
   9 +       sleep $NODE_START_MONITOR_WAIT_TIMEOUT
  10 +#oldbay\\
  11         nxlog "$FUNCNAME ($$): staring"
  12         if [ "$ENABLE_1_5_0_BACKEND" = "1" ]
  13         then
  14 @@ -1875,7 +1879,7 @@
  15  if which "$NODE_AUTOSTART" >/dev/null 2>&1
  16  then
  17         # go into background immediately
  18 -       NXSESSIONID="$sess_id" DISPLAY=:$display "$NODE_AUTOSTART" "$1" >/dev/null 2>&1 &
  19 +       NXSESSIONID="$sess_id" DISPLAY=:$display cmd_node_autostart &
  20         # dont't wait for this child!
  21         disown $!
  22  fi
  23 @@ -1913,6 +1917,15 @@
  24  nxlog "$FUNCNAME ($$): end"
  25  }
  26
  27 +cmd_node_autostart()
  28 +{
  29 +#oldbay//
  30 +# wait to run node_autostart
  31 +       sleep $NODE_START_MONITOR_WAIT_TIMEOUT
  32 +       $NODE_AUTOSTART >/dev/null 2>&1 &
  33 +#oldbay\\
  34 +}
  35 +
  36  #
  37  # -----------------------------------------------------------------------------
  38  # cmd_node functions - changes lots of small variables