diff --git a/iso/builder/config/package-lists/bee.list.chroot b/iso/builder/config/package-lists/bee.list.chroot index dee4cca..75a105a 100644 --- a/iso/builder/config/package-lists/bee.list.chroot +++ b/iso/builder/config/package-lists/bee.list.chroot @@ -55,6 +55,7 @@ xorg xinit xterm chromium +xserver-xorg-video-fbdev # Firmware firmware-linux-free diff --git a/iso/overlay/etc/systemd/system/bee-desktop.service b/iso/overlay/etc/systemd/system/bee-desktop.service deleted file mode 100644 index ab5568f..0000000 --- a/iso/overlay/etc/systemd/system/bee-desktop.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Bee: local desktop (openbox + chromium) -After=bee-web.service -Wants=bee-web.service - -[Service] -User=bee -Environment=DISPLAY=:0 -ExecStart=/usr/local/bin/bee-desktop -Restart=on-failure -RestartSec=3 -StandardOutput=journal -StandardError=journal - -[Install] -WantedBy=multi-user.target diff --git a/iso/overlay/home/bee/.profile b/iso/overlay/home/bee/.profile index ecd1535..eced4a6 100644 --- a/iso/overlay/home/bee/.profile +++ b/iso/overlay/home/bee/.profile @@ -1 +1,8 @@ export PATH="/usr/local/bin:$PATH" + +# On tty1 (IPMI KVM console): start X desktop directly on VT1 +# so the KVM shows the graphical UI without switching VTs. +if [ "$(tty 2>/dev/null)" = "/dev/tty1" ] \ + && [ -z "${DISPLAY:-}" ]; then + exec startx /usr/local/bin/bee-openbox-session -- :0 vt1 -nolisten tcp +fi diff --git a/iso/overlay/usr/local/bin/bee-desktop b/iso/overlay/usr/local/bin/bee-desktop deleted file mode 100755 index c66c430..0000000 --- a/iso/overlay/usr/local/bin/bee-desktop +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# Start X11 + openbox + chromium for the local operator console. -# Runs as the bee user on display :0. -exec startx /usr/local/bin/bee-openbox-session -- :0 -nolisten tcp