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

Show IP in DHCP mode

Browse Source
This commit is contained in:
Kroese 2023-05-08 18:07:19 +02:00 committed by GitHub
parent 7b9c0e00ac
commit a5fe0432f3
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
run/network.sh
View File

@ -31,8 +31,8 @@ configureDHCP() {
{ ip link add link "${VM_NET_DEV}" "${VM_NET_VLAN}" type macvlan mode bridge ; rc=$?; } || : { ip link add link "${VM_NET_DEV}" "${VM_NET_VLAN}" type macvlan mode bridge ; rc=$?; } || :
if (( rc != 0 )); then if (( rc != 0 )); then
echo -n "ERROR: Cannot create macvlan interface. Please make sure the network type is 'macvlan' and not 'ipvlan'." echo "ERROR: Cannot create macvlan interface. Please make sure the network type is 'macvlan' and not 'ipvlan',"
echo " And that the NET_ADMIN capability has been added to the container config: --cap-add NET_ADMIN" && exit 15 echo "ERROR: and that the NET_ADMIN capability has been added to the container config: --cap-add NET_ADMIN" && exit 15
fi fi
ip address add "${IP}" dev "${VM_NET_VLAN}" ip address add "${IP}" dev "${VM_NET_VLAN}"
@ -226,14 +226,9 @@ if [[ "${DHCP}" == [Yy1]* ]]; then
# Configuration for DHCP IP # Configuration for DHCP IP
configureDHCP configureDHCP
# Display the received IP on port 5000
HTML="DSM is using another IP address.<br><br>Check the Docker logfile to see which one was<br> assigned, or download the\
<a href='https://global.synologydownload.com/download/Utility/Assistant/7.0.4-50051/Windows/synology-assistant-7.0.4-50051.exe'>\
Synology Assistant</a> utility."
pkill -f server.sh || true pkill -f server.sh || true
/run/server.sh 80 "${HTML}" > /dev/null & /run/server.sh 80 ipinfo > /dev/null &
/run/server.sh 5000 "${HTML}" > /dev/null & /run/server.sh 5000 ipinfo > /dev/null &
else else