twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-06-04 07:27:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: Add devcontainer (#939)
Some checks are pending
Build / Check (push) Waiting to run
Details
Build / Build (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Kroese 2025-03-18 19:25:27 +01:00 committed by GitHub
parent 5fcd22b09f
commit 608563d029
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.devcontainer.json Normal file
View File

@ -0,0 +1,6 @@
{
"name": "dsm",
"service": "dsm",
"forwardPorts": ["5000"],
"dockerComposeFile": "compose.yml"
}

15
src/network.sh
View File

@ -170,7 +170,7 @@ getHostPorts() {
configureUser() { configureUser() {
NET_OPTS="-netdev user,id=hostnet0,host=${VM_NET_IP%.*}.1,net=${VM_NET_IP%.*}.0/24,dhcpstart=$VM_NET_IP,hostname=$VM_NET_HOST" NET_OPTS="-netdev user,id=hostnet0,host=${VM_NET_IP%.*}.2,net=${VM_NET_IP%.*}.0/24,dhcpstart=$VM_NET_IP,hostname=$VM_NET_HOST"
local forward local forward
forward=$(getUserPorts "$USER_PORTS") forward=$(getUserPorts "$USER_PORTS")
@ -365,9 +365,15 @@ getInfo() {
if [ ! -d "/sys/class/net/$VM_NET_DEV" ]; then if [ ! -d "/sys/class/net/$VM_NET_DEV" ]; then
error "Network interface '$VM_NET_DEV' does not exist inside the container!" error "Network interface '$VM_NET_DEV' does not exist inside the container!"
error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 27 error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 26
fi fi
BASE_IP="${VM_NET_IP%.*}."
if [ "${VM_NET_IP/$BASE_IP/}" -lt "3" ]; then
error "Invalid VM_NET_IP, must end in a higher number than .3" && exit 27
fi
if [ -z "$MTU" ]; then if [ -z "$MTU" ]; then
MTU=$(cat "/sys/class/net/$VM_NET_DEV/mtu") MTU=$(cat "/sys/class/net/$VM_NET_DEV/mtu")
fi fi
@ -436,7 +442,10 @@ if [[ "$DEBUG" == [Yy1]* ]]; then
line="Host: $HOST IP: $IP Gateway: $GATEWAY Interface: $VM_NET_DEV MAC: $VM_NET_MAC MTU: $mtu" line="Host: $HOST IP: $IP Gateway: $GATEWAY Interface: $VM_NET_DEV MAC: $VM_NET_MAC MTU: $mtu"
[[ "$MTU" != "0" ]] && [[ "$MTU" != "$mtu" ]] && line+=" ($MTU)" [[ "$MTU" != "0" ]] && [[ "$MTU" != "$mtu" ]] && line+=" ($MTU)"
info "$line" info "$line"
[ -f /etc/resolv.conf ] && grep '^nameserver*' /etc/resolv.conf if [ -f /etc/resolv.conf ]; then
nameservers=$(grep '^nameserver*' /etc/resolv.conf | head -c -1 | sed 's/nameserver //g;' | sed -z 's/\n/, /g')
[ -n "$nameservers" ] && info "Nameservers: $nameservers"
fi
echo echo
fi fi