[debian-edu-commits] r79597 - in branches/wheezy/debian-edu-config: . debian etc/debian-edu ldap-bootstrap share/ltsp/init-ltsp.d share/ltsp/plugins/ltsp-build-client/Debian-custom

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-04-03 10:33:56 +0000 (Wed, 03 Apr 2013)
New Revision: 79597

Removed:
   branches/wheezy/debian-edu-config/etc/debian-edu/lts.conf.dist
   branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/035-default-lts-conf
Modified:
   branches/wheezy/debian-edu-config/Makefile
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/ldap-bootstrap/ltsp.ldif
   branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/70-edu-client-core
Log:
* Don't edit lts.conf provided by package ltsp-server, cause now
  required changes can be set on-the-fly:
  - Remove lts.conf.dist.
  - Remove 35-default-lts-conf.
  - Edit Makefile to reflect the above changes.
  - Remove line SCREEN_07=ldm from ltsp.ldif, cause this is now done
    during the init-ltsp process.
* 70-edu-client-core: Change positioning to match ltsp v. 5.4.2-6.
  (Fixme: Find a way to get rid of line depending positioning.)

Modified: branches/wheezy/debian-edu-config/Makefile
===================================================================
--- branches/wheezy/debian-edu-config/Makefile	2013-04-03 04:57:45 UTC (rev 79596)
+++ branches/wheezy/debian-edu-config/Makefile	2013-04-03 10:33:56 UTC (rev 79597)
@@ -93,7 +93,6 @@
 	desktop-profiles/debian-edu-config.listing \
 	debian-edu/hd-warn.conf \
 	debian-edu/nightkill.conf \
-	debian-edu/lts.conf.dist \
 	default/munin-node \
 	cfengine/cfservd.conf \
 	cfengine/update.conf \
@@ -420,7 +419,6 @@
  share/ltsp/plugins/ltsp-build-client/Debian-custom/020-rootpath \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/025-bootprompt-opts \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs \
- share/ltsp/plugins/ltsp-build-client/Debian-custom/035-default-lts-conf \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/045-remove-udev-net-rules \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/050-nbdquery \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/095-umount-error \

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-03 04:57:45 UTC (rev 79596)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-03 10:33:56 UTC (rev 79597)
@@ -19,6 +19,15 @@
       default, for thin clients this has to be set to 'False' via
       kernel command line, lts.conf or LDAP entry.)
   * Changelog: Remove useless whitespace.
+  * Don't edit lts.conf provided by package ltsp-server, cause now
+    required changes can be set on-the-fly:
+    - Remove lts.conf.dist.
+    - Remove 35-default-lts-conf.
+    - Edit Makefile to reflect the above changes.
+    - Remove line SCREEN_07=ldm from ltsp.ldif, cause this is now done
+      during the init-ltsp process.
+  * 70-edu-client-core: Change positioning to match ltsp v. 5.4.2-6.
+    (Fixme: Find a way to get rid of line depending positioning.)
 
  -- Mike Gabriel <sunweaver at debian.org>  Mon, 01 Apr 2013 15:26:19 +0200
 

Deleted: branches/wheezy/debian-edu-config/etc/debian-edu/lts.conf.dist
===================================================================
--- branches/wheezy/debian-edu-config/etc/debian-edu/lts.conf.dist	2013-04-03 04:57:45 UTC (rev 79596)
+++ branches/wheezy/debian-edu-config/etc/debian-edu/lts.conf.dist	2013-04-03 10:33:56 UTC (rev 79597)
@@ -1,6 +0,0 @@
-#check /opt/ltsp/i386/usr/share/doc/ltsp-client/examples/lts.conf for a better example lts.conf file
-[Default]
-	NBD_SWAP=Y
-# Workaround for diskless workstations, making sure ldm is still enabled on thin clients
-# even if kdm is installed.
-	SCREEN_07=ldm

Modified: branches/wheezy/debian-edu-config/ldap-bootstrap/ltsp.ldif
===================================================================
--- branches/wheezy/debian-edu-config/ldap-bootstrap/ltsp.ldif	2013-04-03 04:57:45 UTC (rev 79596)
+++ branches/wheezy/debian-edu-config/ldap-bootstrap/ltsp.ldif	2013-04-03 10:33:56 UTC (rev 79597)
@@ -7,4 +7,3 @@
 objectclass: ltspClientConfig
 cn: ltspConfigDefault
 ltspConfig: NBD_SWAP=Y
-ltspConfig: SCREEN_07=ldm

Modified: branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/70-edu-client-core
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/70-edu-client-core	2013-04-03 04:57:45 UTC (rev 79596)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/70-edu-client-core	2013-04-03 10:33:56 UTC (rev 79597)
@@ -3,7 +3,7 @@
 # Get config stored in LDAP for Debian Edu ltsp clients (thin and fat).
 # FIXME: get rid of the ugly positioning issue (hardcoded line 41).
 #
-sed -i '41a\
+sed -i '68a\
         /usr/share/ltsp/get-ldap-ltsp-config\
         cat /var/cache/ltsp/ltsp_config_edu >> /var/cache/ltsp/ltsp_config_env\
         ' /etc/init.d/ltsp-client-core

Deleted: branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/035-default-lts-conf
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/035-default-lts-conf	2013-04-03 04:57:45 UTC (rev 79596)
+++ branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/035-default-lts-conf	2013-04-03 10:33:56 UTC (rev 79597)
@@ -1,8 +0,0 @@
-# Need to run after Debian/030-default-lts-conf to make sure our versions
-# is the one that is used.
-case "$MODE" in
-    finalization)
-        echo "info: Replacing $ROOT/etc/lts.conf using /etc/debian-edu/lts.conf.dist"
-        /bin/cat /etc/debian-edu/lts.conf.dist > $ROOT/etc/lts.conf
-        ;;
-esac