Unverified Commit 63cac9a7 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Display config (#519) 

* fix: Display config
parent 08616f10

src/config.sh

+5 −12
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -Eeuo pipefail



DEF_OPTS="-nographic -nodefaults -boot strict=on -display none"

DEF_OPTS="-nodefaults -boot strict=on"

RAM_OPTS=$(echo "-m $RAM_SIZE" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')

CPU_OPTS="-cpu $CPU_MODEL -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"

MAC_OPTS="-machine type=q35,usb=off,dump-guest-core=off,hpet=off${KVM_OPTS}"

EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"

EXTRA_OPTS="$EXTRA_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"

EXTRA_OPTS="$EXTRA_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"

DEV_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"

DEV_OPTS="$DEV_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"

DEV_OPTS="$DEV_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"



if [[ "$GPU" == [Yy1]* ]] && [[ "$ARCH" == "amd64" ]]; then

  DEF_OPTS="-nodefaults -boot strict=on -display egl-headless,rendernode=/dev/dri/renderD128"

  DEF_OPTS="$DEF_OPTS -device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr=0x1"

fi



[[ "$CONSOLE" != [Yy]* ]] && DEF_OPTS="$DEF_OPTS -daemonize -D $QEMU_LOG"



ARGS="$DEF_OPTS $CPU_OPTS $RAM_OPTS $MAC_OPTS $MON_OPTS $SERIAL_OPTS $NET_OPTS $DISK_OPTS $EXTRA_OPTS $ARGUMENTS"

ARGS="$DEF_OPTS $CPU_OPTS $RAM_OPTS $MAC_OPTS $DISPLAY_OPTS $MON_OPTS $SERIAL_OPTS $NET_OPTS $DISK_OPTS $DEV_OPTS $ARGUMENTS"

ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')



return 0

src/cpu.sh

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ set -Eeuo pipefail 


# Docker environment variables



: ${KVM:='Y'}

: ${HOST_CPU:=''}

: ${CPU_MODEL:='host'}

: ${CPU_FEATURES:='+ssse3,+sse4.1,+sse4.2'}

src/gpu.sh→src/display.sh

+17 −0
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -Eeuo pipefail



# Docker environment variables



: ${GPU:='N'}           # GPU passthrough

: ${DISPLAY:='none'}  # Display type



case "${DISPLAY,,}" in

  vnc)

    DISPLAY_OPTS="-display vnc=:0 -vga virtio"

    ;;

  *)

    DISPLAY_OPTS="-display $DISPLAY -vga none"

    ;;

esac



if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then

  return 0

fi



DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128 -vga virtio"

[[ "${DISPLAY,,}" == "vnc" ]] && DISPLAY_OPTS="$DISPLAY_OPTS -vnc :0"



[ ! -d /dev/dri ] && mkdir -m 755 /dev/dri



if [ ! -c /dev/dri/card0 ]; then

src/entry.sh

+1 −1
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ cd /run 
. reset.sh      # Initialize system

. install.sh    # Run installation

. disk.sh       # Initialize disks

. display.sh    # Initialize graphics

. network.sh    # Initialize network

. gpu.sh        # Initialize graphics

. cpu.sh        # Initialize processor

. serial.sh     # Initialize serialport

. power.sh      # Configure shutdown

src/power.sh

+9 −3
Original line number Diff line number Diff line
@@ -157,10 +157,16 @@ _graceful_shutdown() { 
  finish "$code" && return "$code"

}



MON_OPTS="\

        -pidfile $QEMU_PID \

        -monitor telnet:localhost:$QEMU_PORT,server,nowait,nodelay"



if [[ "$CONSOLE" != [Yy]* ]]; then



  MON_OPTS="$MON_OPTS -daemonize -D $QEMU_LOG"



  _trap _graceful_shutdown SIGTERM SIGHUP SIGINT SIGABRT SIGQUIT



fi



MON_OPTS="\

        -pidfile $QEMU_PID \

        -monitor telnet:localhost:$QEMU_PORT,server,nowait,nodelay"
 
return 0