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

Fix returncode bug

Browse Source
This commit is contained in:
Kroese 2023-05-12 12:57:14 +02:00 committed by GitHub
parent 6c939ca68d
commit 293236b7cd
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
run/network.sh
View File

@ -25,7 +25,7 @@ configureDHCP() {
# Create a macvtap network for the VM guest
{ ip link add link "${VM_NET_DEV}" name "${VM_NET_TAP}" address "${VM_NET_MAC}" type macvtap mode bridge ; rc=$?; } || :
if (( rc != 0 )); then
error "Cannot create macvtap interface. Please make sure the network type is 'macvlan' and not 'ipvlan',"
error "and that the NET_ADMIN capability has been added to the container config: --cap-add NET_ADMIN" && exit 16
@ -62,6 +62,8 @@ configureDHCP() {
fi
NET_OPTS="-netdev tap,id=hostnet0,vhost=on,vhostfd=40,fd=30"
return 0
}
configureNAT () {
@ -155,6 +157,8 @@ configureNAT () {
{ set +x; } 2>/dev/null
[[ "${DEBUG}" == [Yy1]* ]] && echo
return 0
}
# ######################################