From b90203bdd49f996c2bf65656780bad7928e31a23 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:12:57 +0200 Subject: [PATCH 01/11] SERIAL_OPTS --- run/serial.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/serial.sh b/run/serial.sh index 0d533a4..44a8cef 100644 --- a/run/serial.sh +++ b/run/serial.sh @@ -30,7 +30,7 @@ fi -buildnumber="${HOST_BUILD}" \ -guestuuid="${GUEST_UUID}" > /dev/null 2>&1 & -KVM_SERIAL_OPTS="\ +SERIAL_OPTS="\ -serial mon:stdio \ -device virtio-serial-pci,id=virtio-serial0,bus=pcie.0,addr=0x3 \ -chardev pty,id=charserial0 \ From 17cbf16fa4f47c7818510e23bd38cfaa3aebc985 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:13:21 +0200 Subject: [PATCH 02/11] SERIAL_OPTS --- run/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/run.sh b/run/run.sh index 4308e05..9eeeda5 100755 --- a/run/run.sh +++ b/run/run.sh @@ -54,7 +54,7 @@ DEF_OPTS="-nographic" RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g') CPU_OPTS="-smp ${CPU_CORES},sockets=${CPU_CORES},cores=1,threads=1" EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0" -ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_ACC_OPTS} ${KVM_MON_OPTS} ${KVM_SERIAL_OPTS} ${KVM_NET_OPTS} ${KVM_DISK_OPTS} ${EXTRA_OPTS}" +ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_ACC_OPTS} ${KVM_MON_OPTS} ${SERIAL_OPTS} ${KVM_NET_OPTS} ${KVM_DISK_OPTS} ${EXTRA_OPTS}" set -m ( From 7abd74ec7d32ffe5cc972d8be6dde50cc06bd2e7 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:13:48 +0200 Subject: [PATCH 03/11] DISK_OPTS --- run/disk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/disk.sh b/run/disk.sh index c0ebd1e..1e82b8a 100644 --- a/run/disk.sh +++ b/run/disk.sh @@ -125,7 +125,7 @@ if ((AGENT_VERSION < 5)); then echo "INFO: The installed VirtualDSM Agent v${AGENT_VERSION} is an outdated version, please upgrade it." fi -KVM_DISK_OPTS="\ +DISK_OPTS="\ -device virtio-scsi-pci,id=hw-synoboot,bus=pcie.0,addr=0xa \ -drive file=${BOOT},if=none,id=drive-synoboot,format=raw,cache=none,aio=native,discard=on,detect-zeroes=on \ -device scsi-hd,bus=hw-synoboot.0,channel=0,scsi-id=0,lun=0,drive=drive-synoboot,id=synoboot0,rotation_rate=1,bootindex=1 \ From 6ee4be2a24405570c552ea00e1a4e8ac30180aa1 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:14:07 +0200 Subject: [PATCH 04/11] DISK_OPTS --- run/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/run.sh b/run/run.sh index 9eeeda5..50e4a29 100755 --- a/run/run.sh +++ b/run/run.sh @@ -54,7 +54,7 @@ DEF_OPTS="-nographic" RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g') CPU_OPTS="-smp ${CPU_CORES},sockets=${CPU_CORES},cores=1,threads=1" EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0" -ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_ACC_OPTS} ${KVM_MON_OPTS} ${SERIAL_OPTS} ${KVM_NET_OPTS} ${KVM_DISK_OPTS} ${EXTRA_OPTS}" +ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_ACC_OPTS} ${KVM_MON_OPTS} ${SERIAL_OPTS} ${KVM_NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" set -m ( From d8e9c770ebcf5e0ed14aba62c848b8aca87281b8 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:14:52 +0200 Subject: [PATCH 05/11] NET_OPTS --- run/network.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run/network.sh b/run/network.sh index 2d76935..7c78af5 100644 --- a/run/network.sh +++ b/run/network.sh @@ -63,7 +63,7 @@ update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null VM_NET_TAP="_VmNatTap" configureNatNetworks -KVM_NET_OPTS="-netdev tap,ifname=${VM_NET_TAP},script=no,downscript=no,id=hostnet0" +NET_OPTS="-netdev tap,ifname=${VM_NET_TAP},script=no,downscript=no,id=hostnet0" # Build DNS options from container /etc/resolv.conf nameservers=($(grep '^nameserver' /etc/resolv.conf | sed 's/nameserver //')) @@ -88,7 +88,7 @@ fi $DNSMASQ $DNSMASQ_OPTS -KVM_NET_OPTS="${KVM_NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0" +NET_OPTS="${KVM_NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0" # Hack for guest VMs complaining about "bad udp checksums in 5 packets" iptables -A POSTROUTING -t mangle -p udp --dport bootpc -j CHECKSUM --checksum-fill From fbe546eeb0b71f8f1b4bf89a413f053118a52838 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:15:21 +0200 Subject: [PATCH 06/11] NET_OPTS --- run/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/run.sh b/run/run.sh index 50e4a29..d87788a 100755 --- a/run/run.sh +++ b/run/run.sh @@ -54,7 +54,7 @@ DEF_OPTS="-nographic" RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g') CPU_OPTS="-smp ${CPU_CORES},sockets=${CPU_CORES},cores=1,threads=1" EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0" -ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_ACC_OPTS} ${KVM_MON_OPTS} ${SERIAL_OPTS} ${KVM_NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" +ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_ACC_OPTS} ${KVM_MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" set -m ( From b40de0746ca9b6c53f01ac89a230a68f3fc3fc74 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:15:44 +0200 Subject: [PATCH 07/11] MON_OPTS --- run/power.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/power.sh b/run/power.sh index 7a567db..93a592d 100644 --- a/run/power.sh +++ b/run/power.sh @@ -84,4 +84,4 @@ _graceful_shutdown(){ _trap _graceful_shutdown SIGTERM SIGHUP SIGINT SIGABRT SIGQUIT -KVM_MON_OPTS="-monitor telnet:localhost:${QEMU_MONPORT},server,nowait,nodelay" +MON_OPTS="-monitor telnet:localhost:${QEMU_MONPORT},server,nowait,nodelay" From ec31a410468bea42bd15047c6e96ddfbfdbe9c71 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:16:11 +0200 Subject: [PATCH 08/11] MON_OPTS --- run/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/run.sh b/run/run.sh index d87788a..fbd987d 100755 --- a/run/run.sh +++ b/run/run.sh @@ -54,7 +54,7 @@ DEF_OPTS="-nographic" RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g') CPU_OPTS="-smp ${CPU_CORES},sockets=${CPU_CORES},cores=1,threads=1" EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0" -ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_ACC_OPTS} ${KVM_MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" +ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_ACC_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" set -m ( From e8377be4c681502e2b58c07afa059a4a911ebde0 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:17:22 +0200 Subject: [PATCH 09/11] NET_OPTS --- run/network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/network.sh b/run/network.sh index 7c78af5..2303465 100644 --- a/run/network.sh +++ b/run/network.sh @@ -88,7 +88,7 @@ fi $DNSMASQ $DNSMASQ_OPTS -NET_OPTS="${KVM_NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0" +NET_OPTS="${NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0" # Hack for guest VMs complaining about "bad udp checksums in 5 packets" iptables -A POSTROUTING -t mangle -p udp --dport bootpc -j CHECKSUM --checksum-fill From c11b58ec3b57c270ddf49e1b4b2b0e1c1b1946c0 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:24:22 +0200 Subject: [PATCH 10/11] KVM_OPTS --- run/run.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/run/run.sh b/run/run.sh index fbd987d..ad577aa 100755 --- a/run/run.sh +++ b/run/run.sh @@ -40,21 +40,21 @@ fi # Configure shutdown . /run/power.sh -KVM_ACC_OPTS="" +KVM_OPTS="" if [ -e /dev/kvm ] && sh -c 'echo -n > /dev/kvm' &> /dev/null; then if [[ $(grep -e vmx -e svm /proc/cpuinfo) ]]; then - KVM_ACC_OPTS="-machine type=q35,usb=off,accel=kvm -enable-kvm -cpu host" + KVM_OPTS="-machine type=q35,usb=off,accel=kvm -enable-kvm -cpu host" fi fi -[ -z "${KVM_ACC_OPTS}" ] && echo "Error: KVM acceleration is disabled.." && exit 88 +[ -z "${KVM_OPTS}" ] && echo "Error: KVM acceleration is disabled.." && exit 88 DEF_OPTS="-nographic" RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g') CPU_OPTS="-smp ${CPU_CORES},sockets=${CPU_CORES},cores=1,threads=1" EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0" -ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_ACC_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" +ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" set -m ( From a1695cd5e1b55ad5789e68369292726d98f7f081 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 19 Apr 2023 16:27:29 +0200 Subject: [PATCH 11/11] Update check.yml --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3adc3a5..65431a3 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -11,4 +11,4 @@ jobs: - name: Run ShellCheck uses: ludeeus/action-shellcheck@master env: - SHELLCHECK_OPTS: -e SC2001 -e SC2002 -e SC2116 -e SC2034 -e SC1091 -e SC2143 -e SC2223 -e SC2086 -e SC2145 -e SC2015 -e SC2268 -e SC2207 -e SC2064 -e SC2162 -e SC2166 + SHELLCHECK_OPTS: -e SC2001 -e SC2002 -e SC2116 -e SC2034 -e SC1091 -e SC2143 -e SC2223 -e SC2086 -e SC2145 -e SC2015 -e SC2268 -e SC2207 -e SC2064 -e SC2162 -e SC2153 -e SC2166