[debian-edu-commits] [Git][debian-edu/debian-edu-config][personal/sunweaver/x2go-kdeplasma-sessions] 2 commits: bin/debian-edu-ldapserver: Don't use $ldapserver uninitialised.

[Mike Gabriel (@sunweaver)]

Mike Gabriel pushed to branch personal/sunweaver/x2go-kdeplasma-sessions at Debian Edu / debian-edu-config


Commits:
b89ecda1 by Mike Gabriel at 2026-09-15T21:56:17+02:00
bin/debian-edu-ldapserver: Don't use $ldapserver uninitialised.

- - - - -
14abce68 by Mike Gabriel at 2026-09-23T19:46:09+00:00
sbin/debian-edu-ltsp-install: Support KDE in X2Go sessions again.

The X2Go Server fix for #955128 maps old clients' startkde command to
startplasma-x11:

https://code.x2go.org/gitweb?p=x2goserver.git;a=commit;h=28e7669e64ad2ffc629222a017757dd7022f4066

- - - - -


2 changed files:

- bin/debian-edu-ldapserver
- sbin/debian-edu-ltsp-install


Changes:

=====================================
bin/debian-edu-ldapserver
=====================================
@@ -63,7 +63,7 @@ if (on_main_server() && during_installation()) {
             print STDERR "warning: no DNS name from dnsdomainname call.  using $dnsdomain from /etc/resolv.conf.\n" if $opts{d};
         }
         $ldapserver = $opts{s} || find_ldap_server($dnsdomain);
-        print STDERR "info: found ldap server $ldapserver\n" if $opts{d};
+        print STDERR "info: found ldap server $ldapserver\n" if $opts{d} && $ldapserver;
         $krbserver = find_kerberos_server($dnsdomain);
     }
 }


=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -28,10 +28,8 @@ select_desktop () {
     # support
     if [ -x /usr/bin/startxfce4 ]; then # from xfce4-session
         echo XFCE
-    # FIXME x2goclient and x2goserver (x2goruncommand) in Debian only support
-    # startkde which does not exist any more (#955128)
-    #elif [ -x /usr/bin/startplasma-x11 ]; then # from plasma-workspace
-    #    echo KDE
+    elif [ -x /usr/bin/startplasma-x11 ]; then # from plasma-workspace
+        echo KDE
     elif [ -x /usr/bin/gnome-session ]; then # from gnome-session-bin
         echo GNOME
     elif [ -x /usr/bin/mate-session ]; then # from mate-session



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/24299610418d89603b8c4b9900cb8a752a8a545d...14abce6846adc80725897200c89a880c55701909

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/24299610418d89603b8c4b9900cb8a752a8a545d...14abce6846adc80725897200c89a880c55701909
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20260923/c43090d2/attachment-0001.htm>