diff --git a/src/disk.sh b/src/disk.sh index 742dd7c..bc970fb 100644 --- a/src/disk.sh +++ b/src/disk.sh @@ -86,7 +86,7 @@ getSize() { isCow() { local FS=$1 - if [[ "${FS,,}" == "xfs" || "${FS,,}" == "zfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then + if [[ "${FS,,}" == "xfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then return 0 fi diff --git a/src/display.sh b/src/display.sh index f0247eb..6272103 100644 --- a/src/display.sh +++ b/src/display.sh @@ -26,9 +26,9 @@ if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then return 0 fi -[[ "${VGA,,}" == "virtio" ]] && VGA="virtio-vga-gl" +[[ "${VGA,,}" == "virtio" ]] && VGA="virtio-gl" DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128" -DISPLAY_OPTS="$DISPLAY_OPTS -vga none -device $VGA" +DISPLAY_OPTS="$DISPLAY_OPTS -vga $VGA" [[ "${DISPLAY,,}" == "vnc" ]] && DISPLAY_OPTS="$DISPLAY_OPTS -vnc :0" [[ "${DISPLAY,,}" == "web" ]] && DISPLAY_OPTS="$DISPLAY_OPTS -vnc :0,websocket=5700" diff --git a/src/network.sh b/src/network.sh index d681f9f..9c03200 100644 --- a/src/network.sh +++ b/src/network.sh @@ -141,7 +141,6 @@ configureNAT() { # Create a bridge with a static IP for the VM guest VM_NET_IP='20.20.20.21' - [[ "$DEBUG" == [Yy1]* ]] && set -x { ip link add dev dockerbridge type bridge ; rc=$?; } || : @@ -182,9 +181,6 @@ configureNAT() { iptables -A POSTROUTING -t mangle -p udp --dport bootpc -j CHECKSUM --checksum-fill || true fi - { set +x; } 2>/dev/null - [[ "$DEBUG" == [Yy1]* ]] && echo - NET_OPTS="-netdev tap,ifname=$VM_NET_TAP,script=no,downscript=no,id=hostnet0" { exec 40>>/dev/vhost-net; rc=$?; } 2>/dev/null || : @@ -275,7 +271,7 @@ html "Initializing network..." if [[ "$DEBUG" == [Yy1]* ]]; then info "Host: $HOST IP: $IP Gateway: $GATEWAY Interface: $VM_NET_DEV MAC: $VM_NET_MAC" - [ -f /etc/resolv.conf ] && cat /etc/resolv.conf + [ -f /etc/resolv.conf ] && cat /etc/resolv.conf | grep '^nameserver*' echo fi