Skip to content

Commit 88fff3b

Browse files
committed
Move desktop install method to APA
https://github.com/armbian/apa
1 parent cd6c94f commit 88fff3b

File tree

2 files changed

+6
-25
lines changed

2 files changed

+6
-25
lines changed

tests/xfce_desktop.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ENABLED=false
1+
ENABLED=true
22
RELEASE="bookworm:jammy:noble"
33
TESTNAME="XFCE"
44

tools/modules/system/module_desktop.sh

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,14 @@ function module_desktop() {
3838
case "$1" in
3939
"${commands[0]}")
4040

41+
# Add APA development repository - this will be moved to main repo once it gets out of testing phase
42+
echo "deb [trusted=yes] https://github.armbian.com/apa current main" | sudo tee /etc/apt/sources.list.d/armbian-apa.list
43+
4144
# update package list
4245
pkg_update
4346

44-
# desktops has different default login managers
45-
case "$de" in
46-
gnome)
47-
echo "/usr/sbin/gdm3" > /etc/X11/default-display-manager
48-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES}
49-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES_UNINSTALL}
50-
pkg_install -o Dpkg::Options::="--force-confold" gdm3
51-
;;
52-
kde-neon)
53-
echo "/usr/sbin/sddm" > /etc/X11/default-display-manager
54-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES}
55-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES_UNINSTALL}
56-
pkg_install -o Dpkg::Options::="--force-confold" kde-standard
57-
;;
58-
*)
59-
echo "/usr/sbin/lightdm" > /etc/X11/default-display-manager
60-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES}
61-
pkg_install -o Dpkg::Options::="--force-confold" ${PACKAGES_UNINSTALL}
62-
pkg_install -o Dpkg::Options::="--force-confold" lightdm
63-
;;
64-
esac
65-
66-
# install desktop
67-
pkg_install -o Dpkg::Options::="--force-confold" armbian-${DISTROID}-desktop-${de}
47+
# Install desktop package
48+
pkg_install armbian-desktop-${de}
6849

6950
# add user to groups
7051
for additionalgroup in sudo netdev audio video dialout plugdev input bluetooth systemd-journal ssh; do

0 commit comments

Comments
 (0)