twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-02-24 13:30:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Ignore pkill exitcode

Browse Source
This commit is contained in:
Kroese 2023-05-03 06:22:27 +02:00 committed by GitHub
parent cd71291e61
commit 5833b30fc6
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
run/network.sh
View File

@ -230,10 +230,6 @@ if [ "$DHCP" != "Y" ]; then
# Configuration for static IP # Configuration for static IP
configureNAT configureNAT
# Display wait message on port 5000
HTML="Please wait while Virtual DSM is booting...<script>\
setTimeout(() => { document.location.reload(); }, 9999);</script>"
else else
if [[ "$GATEWAY" == "172."* ]]; then if [[ "$GATEWAY" == "172."* ]]; then
@ -248,11 +244,11 @@ else
HTML="The location of DSM is http://${DHCP_IP}:5000<script>\ HTML="The location of DSM is http://${DHCP_IP}:5000<script>\
setTimeout(function(){ window.location.replace('http://${DHCP_IP}:5000'); }, 2000);</script>" setTimeout(function(){ window.location.replace('http://${DHCP_IP}:5000'); }, 2000);</script>"
fi pkill -f server.sh || true
/run/server.sh 80 "${HTML}" > /dev/null &
/run/server.sh 5000 "${HTML}" > /dev/null &
pkill -f server.sh fi
/run/server.sh 80 "${HTML}" > /dev/null &
/run/server.sh 5000 "${HTML}" > /dev/null &
NET_OPTS="${NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0" NET_OPTS="${NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0"