Makefile

@@ -59,6 +59,7 @@ CF3FILES = \
 	cf.sshd \
 	cf.syslog \
 	cf.tftpd \
+	cf.workarounds \
 	cf.xrdp \
 	edu.cf \
 	promises.cf
@@ -341,6 +342,7 @@ install: install-testsuite
 		share/debian-edu-config/tools/exim4-create-environment \
 		share/debian-edu-config/tools/edu-ldap-from-scratch \
 		share/debian-edu-config/ltspfs-mounter-kde \
+		share/debian-edu-config/squid.resolvconf \
 		share/ltsp/get-ldap-ltsp-config \
 		share/initramfs-tools/scripts/nfs-bottom/before-ltsp \
 	; do \
@@ -384,6 +386,7 @@ install: install-testsuite
 		share/debian-edu-config/passwords_stub.dat \
 		share/debian-edu-config/gosa.conf.template \
 		share/debian-edu-config/udisks2.patch \
+		share/debian-edu-config/edu-xfce4-panel.xml \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
 		share/perl5/Debian/Edu.pm \

cf3/cf.grub

@@ -28,11 +28,6 @@ commands:
 
     "/usr/sbin/update-grub"
       contain => in_shell;
-
-  debian.!server.!minimal.!ltspclient.installation::
-
-    "/usr/sbin/plymouth-set-default-theme lines"
-      contain => in_shell;
 }
 
 bundle edit_line grub_conf1
@@ -61,4 +56,3 @@ replace_patterns:
     "LINUX_DEFAULT=\"quiet"
     replace_with => value("LINUX_DEFAULT=\"net.ifnames=0 quiet");
 }
-

cf3/cf.workarounds

+bundle agent workarounds
+{
+
+files:
+
+  # Adjust panel-2, workaround for #913610; remove linking the edu file
+  # once the bug is fixed.
+  debian.xfce.installation::
+
+    "/etc/xdg/xfce4/panel/default.xml"
+      link_from => ln_s("/usr/share/debian-edu-config/edu-xfce4-panel.xml"),
+      move_obstructions => "true";
+
+  # Provide valid squid resolv.conf, remove linking the edu file
+  # once bug #911325 is fixed.
+  debian.squidcache.installation::
+
+    "/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:
+
+  "lxqt/themes/frost/lxqt-origami-light.png" replace_with => value("desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg");
+}

cf3/edu.cf

@@ -30,9 +30,13 @@ bundle common edu
     # Set if atomic partioning has been used (everything on one partion, w/ or w/o lvm).
     "atomic"         expression => returnszero("/usr/bin/namei -mol /skole | /bin/grep T", "useshell");
     # Set if the Squid cache exists; used to avoid superfluously running 'dpkg-reconfigure squid'.
-    "squidcache"     expression => fileexists("/var/spool/squid/00/00");
+    "squidcache"     expression => isdir("/var/spool/squid/00/00");
     # Set if running inside Debian Installer; used to avoid useless LDAP setup upon main server upgrade.
     "di"             expression => fileexists("/etc/apt/apt.conf.d/00IgnoreTimeConflict");
     # Set for networked workstation if the 'education-desktop-other' package is installed.
-    "desktopintern"  and => { fileexists("/usr/share/doc/education-desktop-other"), fileexists("/usr/bin/ntpq") };
+    "desktopintern"  and => { isdir("/usr/share/doc/education-desktop-other"), fileexists("/usr/bin/ntpq") };
+    # Set if xfce4 is installed; used to conditionally configure settings.
+    "xfce"           expression => isdir("/etc/xdg/xfce4");
+    # Set if lxqt is installed; used to conditionally configure settings.
+    "lxqt"           expression => isdir("/usr/share/pcmanfm-qt/lxqt");
 }

cf3/promises.cf

@@ -59,6 +59,7 @@ body common control
                           sshd,
                           syslog,
                           xrdp,
+                          workarounds,
                           tftpd,
                           pxeinstall,
                           finalize,
@@ -96,6 +97,7 @@ body common control
                   "debian-edu/cf.sshd",
                   "debian-edu/cf.syslog",
                   "debian-edu/cf.tftpd",
+                  "debian-edu/cf.workarounds",
                   "debian-edu/cf.xrdp",
       };
 

debian/changelog

+debian-edu-config (2.10.48) UNRELEASED; urgency=medium
+
+  * Work around some bugs (squid, XFCE, LXQt):
+    - Add cf3/cf.workarounds.
+    - Add related variable definitions to cf3/edu.cf to be able to conditionally
+      apply the workarounds.
+    - Adjust cf3/promises.cf to reflect the changes.
+    - Add share/debian-edu-config/{squid.resolvconf,edu-xfce4-panel.xml}.
+    - Adjust Makefile.
+  * Adjust cf3/cf.grub to show the proper plymouth theme.
+
+ -- Wolfgang Schweer <wschweer@arcor.de>  Thu, 22 Nov 2018 15:04:28 +0100
+
 debian-edu-config (2.10.47) unstable; urgency=medium
 
   [ Wolfgang Schweer ]

share/debian-edu-config/edu-xfce4-panel.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-panel" version="1.0">
+  <property name="configver" type="int" value="2"/>
+  <property name="panels" type="array">
+    <value type="int" value="1"/>
+    <value type="int" value="2"/>
+    <property name="panel-1" type="empty">
+      <property name="position" type="string" value="p=6;x=0;y=0"/>
+      <property name="length" type="uint" value="100"/>
+      <property name="position-locked" type="bool" value="true"/>
+      <property name="size" type="uint" value="30"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="1"/>
+        <value type="int" value="3"/>
+        <value type="int" value="15"/>
+        <value type="int" value="4"/>
+        <value type="int" value="5"/>
+        <value type="int" value="6"/>
+        <value type="int" value="2"/>
+      </property>
+    </property>
+    <property name="panel-2" type="empty">
+      <property name="position" type="string" value="p=10;x=0;y=0"/>
+      <property name="position-locked" type="bool" value="true"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="7"/>
+        <value type="int" value="8"/>
+        <value type="int" value="9"/>
+        <value type="int" value="10"/>
+        <value type="int" value="11"/>
+        <value type="int" value="12"/>
+        <value type="int" value="20"/>
+        <value type="int" value="13"/>
+        <value type="int" value="14"/>
+      </property>
+    </property>
+  </property>
+  <property name="plugins" type="empty">
+    <property name="plugin-1" type="string" value="applicationsmenu"/>
+    <property name="plugin-2" type="string" value="actions"/>
+    <property name="plugin-3" type="string" value="tasklist"/>
+    <property name="plugin-15" type="string" value="separator">
+      <property name="expand" type="bool" value="true"/>
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-4" type="string" value="pager"/>
+    <property name="plugin-5" type="string" value="clock"/>
+    <property name="plugin-6" type="string" value="systray"/>
+    <property name="plugin-7" type="string" value="showdesktop"/>
+    <property name="plugin-8" type="string" value="separator"/>
+    <property name="plugin-9" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="exo-terminal-emulator.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-10" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="exo-file-manager.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-11" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="exo-web-browser.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-12" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="xfce4-appfinder.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-13" type="string" value="separator"/>
+    <property name="plugin-14" type="string" value="directorymenu"/>
+    <property name="plugin-20" type="string" value="pulseaudio">
+      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+    </property>
+  </property>
+</channel>

share/debian-edu-config/squid.resolvconf

+#!/bin/sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+
+# Make squid aware of changes to resolv.conf
+# Avoid reload before squid.pid is available
+if  [ -d /run/systemd/system ] && systemctl -q is-active squid || [ -f /var/run/squid.pid ] ; then
+   invoke-rc.d squid reload
+fi