Fully add trinity support

RebornOS-Team · Dec 6, 2022 · e03ad5d · e03ad5d
1 parent 4c0af76
commit e03ad5d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/etc/calamares/modules/displaymanager.conf b/etc/calamares/modules/displaymanager.conf
@@ -12,6 +12,7 @@ displaymanagers:
   - mdm
   - lxdm
   - kdm
+  - tdm
 
 basicSetup: false
 sysconfigSetup: false
diff --git a/etc/calamares/modules/packages_offline.conf b/etc/calamares/modules/packages_offline.conf
@@ -6,7 +6,7 @@
 operations:
   - try_remove:
       - rebornos-iso-welcome
-
+      - rebornos-iso-welcome-rpi
 
 skip_if_no_internet: false
 update_db: false

diff --git a/etc/calamares/modules/packages_online.conf b/etc/calamares/modules/packages_online.conf
@@ -6,6 +6,7 @@
 operations:
   - try_remove:
       - rebornos-iso-welcome
+      - rebornos-iso-welcome-rpi
 
 skip_if_no_internet: false
 update_db: true

diff --git a/etc/calamares/post_install/pre_post_install.sh b/etc/calamares/post_install/pre_post_install.sh
@@ -16,11 +16,15 @@ else
     rm /etc/systemd/system/display-manager.service || true
     #try to enable common display managers but dont crash if they are not installed
     systemctl enable lightdm.service || true
+    systemctl enable tdm.service || true
     systemctl enable gdm.service || true
     systemctl enable lxdm.service || true
     systemctl enable slim.service || true
     systemctl enable mdm.service || true
     systemctl enable sddm.service || true
+    if [ -f /opt/trinity/bin/tdm ] ; then
+        { echo "MaxShowUID=65000"; echo "MinShowUID=1000"; echo "ShowUsers=NotHidden"; } >> /opt/trinity/config/tdm/tdmrc
+    fi
     echo "Removinging LXQt..."
     pacman -Rncsu --noconfirm rebornos-cosmic-lxqt
 

diff --git a/packaging/calamares-configuration/PKGBUILD b/packaging/calamares-configuration/PKGBUILD
@@ -23,7 +23,7 @@ makedepends=()
 source=("https://github.com/RebornOS-Developers/calamares-configuration-rpi/archive/refs/tags/v${pkgver}.tar.gz")
 
 package() {
-    PROJECT_DIRECTORY="${srcdir}/calamares-configuration-${pkgver}"
+    PROJECT_DIRECTORY="${srcdir}/calamares-configuration-rpi-${pkgver}"
     # RESOURCE_DIRECTORY="$PROJECT_DIRECTORY/packaging/resources"
     # BUILD_DIRECTORY="$PROJECT_DIRECTORY/build"
     # NUMBER_OF_PROCESSORS="$(nproc)"