Unverified Commit 28d84bd2 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

Ignore pkill exitcode

parent 3cef0b0b

run/network.sh

+4 −8
Original line number Diff line number Diff line
@@ -230,10 +230,6 @@ if [ "$DHCP" != "Y" ]; then 
  # Configuration for static IP

  configureNAT



  # Display wait message on port 5000

  HTML="Please wait while Virtual DSM is booting...<script>\

        setTimeout(() => { document.location.reload(); }, 9999);</script>"



else



  if [[ "$GATEWAY" == "172."* ]]; then
@@ -248,12 +244,12 @@ else 
  HTML="The location of DSM is http://${DHCP_IP}:5000<script>\

        setTimeout(function(){ window.location.replace('http://${DHCP_IP}:5000'); }, 2000);</script>"



fi



pkill -f server.sh

  pkill -f server.sh || true

  /run/server.sh 80 "${HTML}" > /dev/null &

  /run/server.sh 5000 "${HTML}" > /dev/null &



fi



NET_OPTS="${NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0"



if [ "$DHCP" = "Y" ]; then