diff --git a/src/disk.sh b/src/disk.sh index bcca214..b520587 100644 --- a/src/disk.sh +++ b/src/disk.sh @@ -80,7 +80,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 be5fb9c..2eeaccf 100644 --- a/src/display.sh +++ b/src/display.sh @@ -15,9 +15,8 @@ if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then fi -[[ "${VGA,,}" == "virtio" ]] && VGA="virtio-vga" DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128" -DISPLAY_OPTS="$DISPLAY_OPTS -vga none -device $VGA" +DISPLAY_OPTS="$DISPLAY_OPTS -vga $VGA" [ ! -d /dev/dri ] && mkdir -m 755 /dev/dri diff --git a/src/install.sh b/src/install.sh index 3e928e1..041c1ff 100644 --- a/src/install.sh +++ b/src/install.sh @@ -265,7 +265,7 @@ if ! touch "$SYSTEM"; then error "Could not create file $SYSTEM for the system disk." && exit 98 fi -if [[ "${FS,,}" == "xfs" || "${FS,,}" == "zfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then +if [[ "${FS,,}" == "xfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then { chattr +C "$SYSTEM"; } || : FA=$(lsattr "$SYSTEM") if [[ "$FA" != *"C"* ]]; then diff --git a/src/network.sh b/src/network.sh index c9ce3f9..d6b5337 100644 --- a/src/network.sh +++ b/src/network.sh @@ -117,7 +117,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=$?; } || : @@ -155,9 +154,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 || : @@ -249,7 +245,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 ] && grep '^nameserver*' /etc/resolv.conf echo fi