twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-06-09 01:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove secondary DNS fallback

Browse Source
This commit is contained in:
Kroese 2023-04-18 17:34:51 +02:00 committed by GitHub
commit 44a982f2fb
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/service.sh
View File

@ -8,6 +8,7 @@ status() {
echo 'Service running' echo 'Service running'
return 1 return 1
fi fi
return 0
} }
start() { start() {
@ -15,9 +16,11 @@ start() {
echo 'Service already running' echo 'Service already running'
return 1 return 1
fi fi
echo "-" > /var/lock/subsys/agent.sh
echo 'Starting agent service...' echo 'Starting agent service...'
chmod 666 /dev/ttyS0 chmod 666 /dev/ttyS0
"$SCRIPT" &> /dev/ttyS0 & echo $! > "$PIDFILE" "$SCRIPT" &> /dev/ttyS0 & echo $! > "$PIDFILE"
return 0
} }
stop() { stop() {
@ -25,11 +28,13 @@ stop() {
echo 'Service not running' echo 'Service not running'
return 1 return 1
fi fi
rm -f /var/lock/subsys/agent.sh
echo 'Stopping agent service...' echo 'Stopping agent service...'
chmod 666 /dev/ttyS0 chmod 666 /dev/ttyS0
echo 'Stopping agent service...' > /dev/ttyS0 echo 'Stopping agent service...' > /dev/ttyS0
kill -15 "$(cat "$PIDFILE")" && rm -f "$PIDFILE" kill -15 "$(cat "$PIDFILE")" && rm -f "$PIDFILE"
echo 'Service stopped' echo 'Service stopped'
return 0
} }
case "$1" in case "$1" in
@ -48,4 +53,6 @@ case "$1" in
;; ;;
*) *)
echo "Usage: $0 {start|stop|restart}" echo "Usage: $0 {start|stop|restart}"
exit 1
esac esac

4
run/install.sh
View File

@ -155,12 +155,12 @@ mv $PKG/ $LOC/
LOC="$MOUNT/usr/local/bin" LOC="$MOUNT/usr/local/bin"
mkdir -p $LOC mkdir -p $LOC
cp /agent/agent.sh $LOC/agent.sh cp /agent/agent.sh $LOC/agent.sh
chmod +x $LOC/agent.sh chmod 755 $LOC/agent.sh
LOC="$MOUNT/usr/local/etc/rc.d" LOC="$MOUNT/usr/local/etc/rc.d"
mkdir -p $LOC mkdir -p $LOC
cp /agent/service.sh $LOC/agent.sh cp /agent/service.sh $LOC/agent.sh
chmod +x $LOC/agent.sh chmod 755 $LOC/agent.sh
# Store agent version # Store agent version
echo "5" > "$STORAGE"/"$BASE".agent echo "5" > "$STORAGE"/"$BASE".agent

1
run/network.sh
View File

@ -75,7 +75,6 @@ for nameserver in "${nameservers[@]}"; do
done done
[[ -z $DNS_SERVERS ]] && DNS_SERVERS="1.1.1.1" [[ -z $DNS_SERVERS ]] && DNS_SERVERS="1.1.1.1"
[[ ${DNS_SERVERS} != *","* ]] && DNS_SERVERS="$DNS_SERVERS,1.0.0.1"
DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:dns-server,$DNS_SERVERS --dhcp-option=option:router,${VM_NET_IP%.*}.1" DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:dns-server,$DNS_SERVERS --dhcp-option=option:router,${VM_NET_IP%.*}.1"

3
run/run.sh
View File

@ -52,5 +52,4 @@ set -m
) )
set +m set +m
pidwait -F "${_QEMU_PID}" & pidwait -F "${_QEMU_PID}" & wait $!
wait $!