cf3/cf.workarounds

@@ -22,19 +22,5 @@ files:
     "/etc/resolvconf/update-libc.d/squid"
       link_from => ln_s("/usr/share/debian-edu-config/squid.resolvconf"),
       move_obstructions => "true";
-
-  # Provide the Debian Edu desktop background for LXQt, remove editing the file
-  # once bug #914345 (against pcmanfm-qt) is fixed.
-  debian.lxqt.installation::
-
-    "/usr/share/pcmanfm-qt/lxqt/settings.conf"
-    edit_line => conf1;
 }
 
-bundle edit_line conf1
-{
-
-replace_patterns:
-
-  "/usr/share/lxqt/themes/frost/lxqt-origami-light.png" replace_with => value("/etc/alternatives/desktop-background");
-}

debian/changelog

+debian-edu-config (2.10.59) UNRELEASED; urgency=medium
+
+  * debian/debian-edu-config.fetch-ldap-cert:
+    - Adjust condition now that ldap.conf isn't modified any longer.
+  * etc/debian-edu/pxeinstall.conf and etc/debian-edu/pxeinstall.conf:
+    - Adjust PXE installation settings; prefer amd64 i386 order over i386 amd64
+      for the PXE menu, use nbd0 instead of nfs as LTSP root device value.
+  * etc/ltsp/ltsp-build-client.conf:
+    - Add commented option for the sources.list file.
+  * cf3/cf.workarounds:
+    - Remove LXQt related workaround now that bug #914345 has been fixed.
+
+ -- Wolfgang Schweer <wschweer@arcor.de>  Tue, 05 Feb 2019 00:24:07 +0100
+
 debian-edu-config (2.10.58) unstable; urgency=medium
 
   [ Wolfgang Schweer ]

debian/debian-edu-config.fetch-ldap-cert

@@ -28,8 +28,8 @@ do_start() {
     LDAPSERVER=$(debian-edu-ldapserver)
 
     ERROR=false
-    if [ -f /etc/ldap/ldap.conf ] &&
-       grep -q /etc/ssl/certs/debian-edu-server.crt /etc/ldap/ldap.conf ; then
+    if [ -f /etc/nslcd.conf ] &&
+       grep -q /etc/ssl/certs/debian-edu-server.crt /etc/nslcd.conf ; then
 	if [ -z "$LDAPSERVER" ] ; then
 	    msg="Failed to locate LDAP server"
 	    log_action_begin_msg "$msg"
@@ -52,8 +52,8 @@ do_start() {
     fi
     if [ -d /opt/ltsp ] ; then
 	for ltsp_chroot in `find /opt/ltsp/ -mindepth 1 -maxdepth 1 -type d`; do
-	    if [ ! -f $ltsp_chroot$CERTFILE ] && [ -f $ltsp_chroot/etc/ldap/ldap.conf ] &&
-		grep -q /etc/ssl/certs/debian-edu-server.crt $ltsp_chroot/etc/ldap/ldap.conf ; then
+	    if [ ! -f $ltsp_chroot$CERTFILE ] && [ -f $ltsp_chroot/etc/nslcd.conf ] &&
+		grep -q /etc/ssl/certs/debian-edu-server.crt $ltsp_chroot/etc/nslcd.conf ; then
 		[ "$VERBOSE" != no ] && 
 		log_action_begin_msg "Copying LDAP SSL certificate to ltsp-chroot $ltsp_chroot "
 		if test -s $CERTFILE; then

etc/debian-edu/pxeinstall.conf

@@ -6,9 +6,9 @@
 # needed; see the manual for details.
 #ltsparch=i386
 
-# Set if NBD instead of default NFS is to be used for LTSP (10.0.0.0/8 network);
+# Set if NFS instead of default NBD is to be used for LTSP (10.0.0.0/8 network);
 # see the manual for details.
-#rootdev=nbd0
+#rootdev=nfs
 
 # Set a different desktop environment for new installations instead of the default xfce one.
 #mydesktop=mate

etc/ltsp/ltsp-build-client.conf

@@ -9,6 +9,9 @@
 #NFS_ROOT="True"
 #SQUASHFS_IMAGE="False"
 
-# This setting is needed to be able to install a chroot using the BD ISO image
-# (takes effect with LTSP release 5.18.12).
+# This setting is needed to be able to install a chroot using the BD ISO image.
 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"

sbin/debian-edu-pxeinstall

@@ -54,7 +54,7 @@ if [ -f /etc/environment ] ; then
 fi
 
 [ "$dist" ]       || dist=$(lsb_release -sc)
-[ "$archs" ]      || archs="i386 amd64"
+[ "$archs" ]      || archs="amd64 i386"
 [ "$ltsparch" ]   || ltsparch=$(dpkg --print-architecture)
 [ "$mirrorurl" ]  || mirrorurl=http://deb.debian.org/debian
 [ "$hostname" ]   || hostname=pxeinstall
@@ -62,7 +62,7 @@ fi
 [ "$mydesktop" ]  || mydesktop=xfce
 [ "$graphicdi" ]  || graphicdi=false
 [ "$dailydi" ]    || dailydi=false
-[ "$rootdev" ]    || rootdev=nfs
+[ "$rootdev" ]    || rootdev=nbd0
 # Not hardcoded to allow PXE installation of a main-server without a
 # proxy set
 #[ "$http_proxy" ] || http_proxy=http://webcache:3128