mirror of
https://github.com/vdsm/virtual-dsm.git
synced 2025-11-06 01:54:52 +08:00
Compare commits
2 Commits
b694d6faf8
...
f2937ab507
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f2937ab507 | ||
|
|
399829cf3c |
@ -63,7 +63,7 @@ configureDHCP() {
|
||||
|
||||
if [[ "$MTU" != "0" && "$MTU" != "1500" ]]; then
|
||||
if ! ip link set dev "$VM_NET_TAP" mtu "$MTU"; then
|
||||
warn "Failed to set MTU size.."
|
||||
warn "Failed to set MTU size to $MTU." && MTU="0"
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -184,6 +184,7 @@ getHostPorts() {
|
||||
|
||||
local list="$1"
|
||||
|
||||
[ -z "$list" ] && list="$MON_PORT" || list+=",$MON_PORT"
|
||||
[ -z "$list" ] && echo "" && return 0
|
||||
|
||||
if [[ "$list" != *","* ]]; then
|
||||
@ -265,7 +266,7 @@ configureNAT() {
|
||||
|
||||
if [[ "$MTU" != "0" && "$MTU" != "1500" ]]; then
|
||||
if ! ip link set dev "$VM_NET_TAP" mtu "$MTU"; then
|
||||
warn "Failed to set MTU size.."
|
||||
warn "Failed to set MTU size to $MTU." && MTU="0"
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -442,10 +443,6 @@ getInfo() {
|
||||
MTU=$(cat "/sys/class/net/$VM_NET_DEV/mtu")
|
||||
fi
|
||||
|
||||
if [ "$MTU" -gt "1500" ]; then
|
||||
info "MTU size is too large: $MTU, ignoring..." && MTU="0"
|
||||
fi
|
||||
|
||||
if [[ "${ADAPTER,,}" != "virtio-net-pci" ]]; then
|
||||
if [[ "$MTU" != "0" && "$MTU" != "1500" ]]; then
|
||||
warn "MTU size is $MTU, but cannot be set for $ADAPTER adapters!" && MTU="0"
|
||||
|
||||
12
src/power.sh
12
src/power.sh
@ -1,15 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
|
||||
: "${API_TIMEOUT:="50"}" # API Call timeout
|
||||
: "${QEMU_TIMEOUT:="50"}" # QEMU Termination timeout
|
||||
|
||||
# Configure QEMU for graceful shutdown
|
||||
|
||||
API_CMD=6
|
||||
API_HOST="127.0.0.1:2210"
|
||||
: "${API_TIMEOUT:="50"}" # API Call timeout
|
||||
|
||||
QEMU_TERM=""
|
||||
QEMU_PORT=7100
|
||||
: "${QEMU_TIMEOUT:="50"}" # QEMU Termination timeout
|
||||
QEMU_DIR="/run/shm"
|
||||
QEMU_PID="$QEMU_DIR/qemu.pid"
|
||||
QEMU_LOG="$QEMU_DIR/qemu.log"
|
||||
@ -83,7 +83,7 @@ terminal() {
|
||||
fi
|
||||
|
||||
if [ ! -c "$dev" ]; then
|
||||
dev=$(echo 'info chardev' | nc -q 1 -w 1 localhost "$QEMU_PORT" | tr -d '\000')
|
||||
dev=$(echo 'info chardev' | nc -q 1 -w 1 localhost "$MON_PORT" | tr -d '\000')
|
||||
dev="${dev#*serial0}"
|
||||
dev="${dev#*pty:}"
|
||||
dev="${dev%%$'\n'*}"
|
||||
@ -127,7 +127,7 @@ _graceful_shutdown() {
|
||||
fi
|
||||
|
||||
# Don't send the powerdown signal because vDSM ignores ACPI signals
|
||||
# echo 'system_powerdown' | nc -q 1 -w 1 localhost "${QEMU_PORT}" > /dev/null
|
||||
# echo 'system_powerdown' | nc -q 1 -w 1 localhost "$MON_PORT" > /dev/null
|
||||
|
||||
# Send shutdown command to guest agent via serial port
|
||||
url="http://$API_HOST/read?command=$API_CMD&timeout=$API_TIMEOUT"
|
||||
@ -172,7 +172,7 @@ _graceful_shutdown() {
|
||||
MON_OPTS="\
|
||||
-pidfile $QEMU_PID \
|
||||
-name $PROCESS,process=$PROCESS,debug-threads=on \
|
||||
-monitor telnet:localhost:$QEMU_PORT,server,nowait,nodelay"
|
||||
-monitor telnet:localhost:$MON_PORT,server,nowait,nodelay"
|
||||
|
||||
if [[ "$CONSOLE" != [Yy]* ]]; then
|
||||
|
||||
|
||||
@ -203,6 +203,7 @@ addPackage() {
|
||||
return 0
|
||||
}
|
||||
|
||||
: "${MON_PORT:="7100"}" # Monitor port
|
||||
: "${WEB_PORT:="5000"}" # Webserver port
|
||||
|
||||
cp -r /var/www/* /run/shm
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user