mirror of
https://github.com/vdsm/virtual-dsm.git
synced 2025-11-08 02:53:45 +08:00
Compare commits
2 Commits
v7.43
...
3db91f077f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3db91f077f | ||
|
|
fae14f4dd9 |
@@ -20,6 +20,7 @@ set -Eeuo pipefail
|
|||||||
: "${VM_NET_MASK:="255.255.255.0"}"
|
: "${VM_NET_MASK:="255.255.255.0"}"
|
||||||
|
|
||||||
: "${PASST:="passt"}"
|
: "${PASST:="passt"}"
|
||||||
|
: "${PASST_MTU:=""}"
|
||||||
: "${PASST_OPTS:=""}"
|
: "${PASST_OPTS:=""}"
|
||||||
: "${PASST_DEBUG:=""}"
|
: "${PASST_DEBUG:=""}"
|
||||||
|
|
||||||
@@ -295,13 +296,14 @@ configurePasst() {
|
|||||||
PASST_OPTS+=" -a $ip"
|
PASST_OPTS+=" -a $ip"
|
||||||
PASST_OPTS+=" -g $gateway"
|
PASST_OPTS+=" -g $gateway"
|
||||||
PASST_OPTS+=" -n $VM_NET_MASK"
|
PASST_OPTS+=" -n $VM_NET_MASK"
|
||||||
|
[ -n "$PASST_MTU" ] && PASST_OPTS+=" -m $PASST_MTU"
|
||||||
|
|
||||||
exclude=$(getHostPorts "$HOST_PORTS")
|
exclude=$(getHostPorts "$HOST_PORTS")
|
||||||
|
|
||||||
if [ -z "$exclude" ]; then
|
if [ -z "$exclude" ]; then
|
||||||
exclude="all"
|
exclude="%${VM_NET_DEV}/all"
|
||||||
else
|
else
|
||||||
exclude="~${exclude//,/,~}"
|
exclude="%${VM_NET_DEV}/~${exclude//,/,~}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PASST_OPTS+=" -t $exclude"
|
PASST_OPTS+=" -t $exclude"
|
||||||
|
|||||||
@@ -3,9 +3,14 @@ set -Eeuo pipefail
|
|||||||
|
|
||||||
path="/run/shm/msg.html"
|
path="/run/shm/msg.html"
|
||||||
|
|
||||||
|
if [ -f "$path" ] && [ -s "$path" ]; then
|
||||||
|
echo -n "s: " && cat "$path"
|
||||||
|
fi
|
||||||
|
|
||||||
inotifywait -m "$path" |
|
inotifywait -m "$path" |
|
||||||
while read -r fp event fn; do
|
while read -r fp event fn; do
|
||||||
case "${event,,}" in
|
case "${event,,}" in
|
||||||
"modify" ) echo -n "s: " && cat "$path" ;;
|
"modify"* ) echo -n "s: " && cat "$path" ;;
|
||||||
|
"delete_self" ) echo "c: vnc" ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user