cf3/cf.finalize

@@ -14,13 +14,43 @@ files:
     link_from => ln_s("/usr/share/debian-edu-config/lightdm-gtk-greeter.conf"),
     move_obstructions => "true";
 
-  # Make sure menu overrides are enabled in each case.
+  # Make sure desktop-profiles are disabled, use XDG instead; this more general
+  # approach is actually needed for LXQt to show structured Edu menus now that
+  # lxqt depends on the 'lxqt-branding-debian' package.
 
   debian.installation::
 
     "/etc/default/desktop-profiles"
     edit_line => profile;
 
+    "/etc/xdg/menus/applications-merged"
+    link_from => ln_s("/usr/share/debian-edu/menu/menus/applications-merged"),
+    move_obstructions => "true";
+
+    "/etc/xdg/menus/gnome-applications.menu"
+    link_from => ln_s("/usr/share/debian-edu/menu/menus/gnome-applications.menu"),
+    move_obstructions => "true";
+
+    "/etc/xdg/menus/kf5-applications.menu"
+    link_from => ln_s("/usr/share/debian-edu/menu/menus/kf5-applications.menu"),
+    move_obstructions => "true";
+
+    "/etc/xdg/menus/lxde-applications.menu"
+    link_from => ln_s("/usr/share/debian-edu/menu/menus/lxde-applications.menu"),
+    move_obstructions => "true";
+
+    "/etc/xdg/menus/lxqt-applications.menu"
+    link_from => ln_s("/usr/share/debian-edu/menu/menus/lxqt-applications.menu"),
+    move_obstructions => "true";
+
+    "/etc/xdg/menus/mate-applications.menu"
+    link_from => ln_s("/usr/share/debian-edu/menu/menus/mate-applications.menu"),
+    move_obstructions => "true";
+
+    "/etc/xdg/menus/xfce-applications.menu"
+    link_from => ln_s("/usr/share/debian-edu/menu/menus/xfce-applications.menu"),
+    move_obstructions => "true";
+
 commands:
 
   debian.server.installation::
@@ -73,7 +103,9 @@ bundle edit_line profile
 
 replace_patterns:
 
-  "PERSONALITY=polite" replace_with => value("PERSONALITY=rude");
+  "PERSONALITY=polite" replace_with => value("PERSONALITY=sheep");
+  # Needed if upgrading from 10+edu~a0
+  "PERSONALITY=rude" replace_with => value("PERSONALITY=sheep");
 }
 
 bundle agent editline_finalize

debian/changelog

+debian-edu-config (2.10.64) UNRELEASED; urgency=medium
+
+  * etc/ltsp/ltsp-build-client.conf: Add DIST="buster". (Closes: #926183)
+    - Make sure the LTSP chroot installation works for all possible scenarios.
+  * cf3/cf.finalize: Use XDG instead of desktop-profiles. (Closes: #926184)
+    - Make sure desktop-profiles are disabled and use XDG as a more general
+      approach. This is needed for LXQt to work without user interaction.
+  * tools/gosa-sync-dns-nfs: Make tool more robust. (Closes: #926186)
+    - Invalidate the nscd netgroup cache to make NFS homedir mount more robust.
+
+ -- Wolfgang Schweer <wschweer@arcor.de>  Wed, 27 Mar 2019 11:51:55 +0100
+
 debian-edu-config (2.10.63) unstable; urgency=medium
 
   [ Wolfgang Schweer ]

etc/ltsp/ltsp-build-client.conf

@@ -15,3 +15,5 @@ TRUST_FILE_MIRROR="True"
 # Set the next entry if the sources.list file should be copied from the server
 # instead of being generated at chroot installation time.
 #COPY_SOURCES_LIST="True"
+
+DIST="buster"

share/debian-edu-config/tools/gosa-sync-dns-nfs

@@ -2,9 +2,11 @@
 #
 # Update DNS and NFS export when a new host is created, to allow
 # changes in DNS and netgroup membership to take effect imediately.
+# Invalidate the nscd netgroup cache to make NFS homedir mounting more robust.
 
 PATH=/usr/sbin:/sbin:$PATH
 export PATH
 
 su -s /bin/sh -c "PATH=$PATH /usr/sbin/ldap2bind" bind
 exportfs -a
+nscd -i netgroup