Skip to content

Commit

Permalink
04.configure-desktop-env/02.vnc-server: remove dummy display
Browse files Browse the repository at this point in the history
Now that the xserver.service handles the setup for systems that don't have video output, this feature is no longer necessary.

Signed-off-by: mlradu <[email protected]>
  • Loading branch information
mlradu committed Sep 3, 2024
1 parent 7d15c98 commit 1b0b03d
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
# Check if the system has a display output
if dmesg | grep -q "\[drm\]"; then
# Remove dummy display
if [ -e /usr/share/X11/xorg.conf.d/xorg.conf ]; then
rm /usr/share/X11/xorg.conf.d/xorg.conf
fi
rm -f /usr/share/X11/xorg.conf.d/xorg.conf
else
# Enable dummy display
enable_dummy_display.sh
Expand Down
21 changes: 0 additions & 21 deletions stages/04.configure-desktop-env/02.vnc-server/files/xorg.conf

This file was deleted.

11 changes: 0 additions & 11 deletions stages/04.configure-desktop-env/02.vnc-server/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
# Copyright (c) 2024 Analog Devices, Inc.
# Author: Larisa Radu <[email protected]>

HELP="To enable VNC on a board that has a display port, you only need to install the service. This is the default approach in the script. \
\nTo enable VNC on a board that doesn't have a display port, you need to install the xorg.conf file that contains a dummy display. \
\nYou can do this by uncommenting line 21. \
\nOnce you have installed the dummy display, your desktop environment might not start if you switch to a board that has a display port. \
\nIn order to go back to the initial configuration, you only need to delete /usr/share/X11/xorg.conf.d/xorg.conf file and reboot. \
\n \
\nThe VNC password is: analog"

if [ "${CONFIG_DESKTOP}" = y ]; then

# Add x11vnc service
Expand All @@ -25,9 +17,6 @@ install -m 644 "${BASH_SOURCE%%/run.sh}"/files/xserver.service "${BUILD_DIR}/lib
# Add xserver script
install -m 755 "${BASH_SOURCE%%/run.sh}"/files/adi-xserver.sh "${BUILD_DIR}/usr/bin/"

# Add dummy display
#install -m 644 "${BASH_SOURCE%%/run.sh}"/files/xorg.conf "${BUILD_DIR}/usr/share/X11/xorg.conf.d/"

install -d "${BUILD_DIR}/home/analog/.vnc"

chroot "${BUILD_DIR}" << EOF
Expand Down

0 comments on commit 1b0b03d

Please sign in to comment.