[debian-edu-commits] debian-edu/ 01/01: Fix KDE desktop background setting. Add workaround to share/debian-edu-config/tools/run-at-firstboot

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit f1f4d80972663e5490eb5cdf35eac0b648512354
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Nov 10 19:43:23 2016 +0100

    Fix KDE desktop background setting. Add workaround to share/debian-edu-config/tools/run-at-firstboot
---
 debian/changelog                               | 3 +++
 share/debian-edu-config/tools/run-at-firstboot | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e6b8cc6..8171b21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ debian-edu-config (1.918) UNRELEASED; urgency=medium
     - cf/cf.apt
     - sbin/debian-edu-ltsp
     - sbin/debian-edu-pxeinstall
+  * share/debian-edu-config/tools/run-at-firstboot:
+    Add workaround to fix KDE Plasma wallpaper setting as there seems to be
+    a timing problem if KDE is installed after debian-edu-artwork.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 08 Nov 2016 17:01:53 +0100
 
diff --git a/share/debian-edu-config/tools/run-at-firstboot b/share/debian-edu-config/tools/run-at-firstboot
index bbca94d..cf4d5dc 100755
--- a/share/debian-edu-config/tools/run-at-firstboot
+++ b/share/debian-edu-config/tools/run-at-firstboot
@@ -74,6 +74,13 @@ if echo "$PROFILE" | grep -q Main-Server && \
     /usr/share/debian-edu-config/tools/squid-update-cachedir /etc/squid/squid-debian-edu.conf
 fi
 
+# Fix KDE Plasma wallpaper setting as there seems to be a timing problem
+# if KDE is installed after debian-edu-artwork.
+if echo "$PROFILE" | grep -q Workstation && \
+    [ -x /usr/bin/kdeinit5 ] ; then
+    /usr/sbin/update-debian-edu-artwork-softwaves configure
+fi
+
 # Update PXE setup on Main-server with proxy values set in environment
 # to make sure the proxy values are passed on to clients.  When set up
 # from cfengine, the proxy values are not passed on and missing from

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git