[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 3 commits: debian/control: Remove unneeded Suggests: atftpd | tftpd-hpa.

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
71346ca4 by Wolfgang Schweer at 2018-07-18T14:07:06+02:00
debian/control: Remove unneeded Suggests: atftpd | tftpd-hpa.

- - - - -
f314d05b by Wolfgang Schweer at 2018-07-18T14:08:15+02:00
ltsp/init-ltsp.d/60-edu-client: Disable desktop-autoloader for thin clients.

Even if activated and configured, desktop-autoloader makes no sense for TCs.

- - - - -
4214bc57 by Wolfgang Schweer at 2018-07-18T14:19:34+02:00
Add changelog entries for last commits.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- share/ltsp/init-ltsp.d/60-edu-client


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debian-edu-config (2.10.31) UNRELEASED; urgency=medium
+
+  * debian/control: Remove unneeded Suggests: atftpd | tftpd-hpa.
+  * ltsp/init-ltsp.d/60-edu-client: Disable desktop-autoloader for thin clients.
+    The desktop-autoloader needs site specific configuration (and activation);
+    this code makes sure to only run it on diskless workstations.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 18 Jul 2018 14:12:15 +0200
+
 debian-edu-config (2.10.30) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,6 @@ Recommends: binutils,
             memtest86+,
             resolvconf,
             syslinux
-Suggests: atftpd | tftpd-hpa
 Description: Configuration files for Skolelinux systems
  Installs cfengine config files to be used by the machines set up as part
  of the Skolelinux project.


=====================================
share/ltsp/init-ltsp.d/60-edu-client
=====================================
--- a/share/ltsp/init-ltsp.d/60-edu-client
+++ b/share/ltsp/init-ltsp.d/60-edu-client
@@ -48,4 +48,9 @@ if ! boolean_is_true "$LTSP_FATCLIENT" ; then
       ; do
         service_disable $service
     done
+    if [ -f /etc/cron.d/desktop-autoloader ] ; then
+        rm /etc/cron.d/desktop-autoloader
+    fi
 fi
+
+



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/10ab3f206fb43e1cfdec7c686ec21d9cd8bfad68...4214bc579ccfce856a293be628233306bf057acc

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/10ab3f206fb43e1cfdec7c686ec21d9cd8bfad68...4214bc579ccfce856a293be628233306bf057acc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20180718/b18c1129/attachment-0001.html>