[debian-edu-commits] debian-edu/ 01/01: share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings: Add workarounds for LTSP bugs #839154 and #840667 so that the chroot installation can succeed.

[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 b62f348719bc2d7b07026280349f70d9102bd4d2
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Oct 16 12:26:27 2016 +0200

    share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings:
    Add workarounds for LTSP bugs #839154 and #840667 so that the chroot
    installation can succeed.
---
 debian/changelog                                             |  3 +++
 .../ltsp-build-client/Debian-custom/001-ltsp-settings        | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bf144e1..d48680d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ debian-edu-config (1.915) UNRELEASED; urgency=medium
 
   * sbin/debian-edu-pxeinstall: Add instructions how to fetch daily d-i
     netboot images to ease testing during development.
+  * share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings:
+    Add workarounds for LTSP bugs #839154 and #840667 so that the chroot
+    installation can succeed.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 11 Oct 2016 11:04:43 +0200
 
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings b/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings
index 58625e3..c2e3b12 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings
@@ -18,3 +18,15 @@ case $MODE in
     ) >> $ROOT/etc/apt/apt.conf.d/90ltsp-build-client
   ;;
 esac
+
+# FIXME workaround for package initscripts.
+# should be removed once #839154 is fixed.
+if [ -e /usr/share/ltsp/plugins/ltsp-build-client/Debian/025-var-rw-subdirs ] ; then
+    rm /usr/share/ltsp/plugins/ltsp-build-client/Debian/025-var-rw-subdirs
+fi
+
+# FIXME workaround for wrong /tmp permissions.
+# should be removed once #840667 is fixed.
+if [ -e /usr/share/ltsp/plugins/ltsp-build-client/Debian/005-tmpdir ] ; then
+    rm /usr/share/ltsp/plugins/ltsp-build-client/Debian/005-tmpdir
+fi

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