diff --git a/Jenkinsfile b/Jenkinsfile index 0d41641..681fd9e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -130,8 +130,6 @@ pipeline { cp -R /usr/share/live-helper/templates/* config/templates/ sed -i \ - -e 's|^menu vshift.*|menu vshift 0|' \ - -e 's|^menu hshift.*|menu hshift 0|' \ -e 's|^menu width.*|menu width 60|' \ -e 's|^menu color sel.*|menu color sel * #ff82c059 #c01f1f1f none|' \ -e 's|^menu color unsel.*|menu color unsel * #8082c059 #c01f1f1f none|' \ diff --git a/internal/rootfs/opt/retrodebian/fluxbox/set-resolution.sh b/internal/rootfs/opt/retrodebian/fluxbox/set-resolution.sh index 9e0854b..71a46a8 100644 --- a/internal/rootfs/opt/retrodebian/fluxbox/set-resolution.sh +++ b/internal/rootfs/opt/retrodebian/fluxbox/set-resolution.sh @@ -11,22 +11,7 @@ case "$MODE" in ;; esac -# Old xrandr first -if command -v xrandr >/dev/null 2>&1; then - if xrandr -s "$MODE" >/dev/null 2>&1; then - exit 0 - fi +: "${DISPLAY:=:0}" +export DISPLAY - if xrandr --size "$MODE" >/dev/null 2>&1; then - exit 0 - fi - - # Try single connected output if newer syntax is available - OUT="$(xrandr 2>/dev/null | awk '/ connected/{print $1; exit}')" - if [ -n "${OUT:-}" ] && xrandr --output "$OUT" --mode "$MODE" >/dev/null 2>&1; then - exit 0 - fi -fi - -echo "Failed to switch resolution to $MODE" >&2 -exit 1 \ No newline at end of file +exec xrandr -s "$MODE" \ No newline at end of file