[debian-edu-commits] r79505 - in branches/wheezy/debian-edu-config: . debian share/ltsp share/ltsp/init-ltsp.d share/ltsp/plugins/ltsp-build-client/Debian-custom
schweer-guest at alioth.debian.org
schweer-guest at alioth.debian.org
Thu Mar 28 13:48:59 UTC 2013
Author: schweer-guest
Date: 2013-03-28 13:48:59 +0000 (Thu, 28 Mar 2013)
New Revision: 79505
Added:
branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/
branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-nsswitch
branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/70-edu-client-core
Modified:
branches/wheezy/debian-edu-config/Makefile
branches/wheezy/debian-edu-config/debian/changelog
branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
Log:
* LTSP now uses an aufs overlay filesystem (whole rootfs), so things
have changed considerably as it is possible to change almost all
configuration on-the-fly:
- Add share/ltsp/get-ldap-ltsp-config.
- Add share/ltsp/init-ltsp.d/70-edu-client-core. This snippet
modifies /etc/init.d/ltsp-client-core to get config stored in
LDAP for Debian Edu ltsp clients (thin and fat) by calling
get-ldap-ltsp-config.
- Add share/ltsp/init-ltsp.d/60-edu-nsswitch. For Debian Edu
diskless workstations: Modify priority to make KERBEROS work.
- Remove now obsolete files:
+ share/debian-edu-config/ltsp_set_runlevel
+ share/debian-edu-config/ltsp_local_mount
+ share/ltsp/ltsp_config.d/debian-edu-config-rwbind
+ share/ltsp/ltsp_config.d/debian-edu-config-ldap
- Comment out lines in 032-edu-pkgs concerning obsoleted files.
* Change Makefile to reflect these changes.
Modified: branches/wheezy/debian-edu-config/Makefile
===================================================================
--- branches/wheezy/debian-edu-config/Makefile 2013-03-28 11:17:27 UTC (rev 79504)
+++ branches/wheezy/debian-edu-config/Makefile 2013-03-28 13:48:59 UTC (rev 79505)
@@ -379,12 +379,11 @@
share/debian-edu-config/tools/update-iceweasel-homepage \
share/debian-edu-config/tools/update-proxy-from-wpad \
share/debian-edu-config/tools/wpad-extract \
- share/debian-edu-config/ltsp_set_runlevel \
- share/debian-edu-config/ltsp_local_mount \
share/debian-edu-config/ltspfs-mounter-kde \
+ share/ltsp/get-ldap-ltsp-config \
+ share/ltsp/init-ltsp.d/60-edu-nsswitch \
+ share/ltsp/init-ltsp.d/70-edu-client-core \
share/initramfs-tools/scripts/nfs-bottom/before-ltsp \
- share/ltsp/ltsp_config.d/debian-edu-config-ldap \
- share/ltsp/ltsp_config.d/debian-edu-config-rwbind \
; do \
$(INSTALL) $$f $(DESTDIR)/usr/$$f ; \
done
Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog 2013-03-28 11:17:27 UTC (rev 79504)
+++ branches/wheezy/debian-edu-config/debian/changelog 2013-03-28 13:48:59 UTC (rev 79505)
@@ -12,6 +12,23 @@
* etckeeper is now located in /usr/bin instead of /usr/sbin:
- Correct path in tools/run-at-firstboot.
- Correct path in debian-edu-config.postinstall.
+ * LTSP now uses an aufs overlay filesystem (whole rootfs), so things
+ have changed considerably as it is possible to change almost all
+ configuration on-the-fly:
+ - Add share/ltsp/get-ldap-ltsp-config.
+ - Add share/ltsp/init-ltsp.d/70-edu-client-core. This snippet
+ modifies /etc/init.d/ltsp-client-core to get config stored in
+ LDAP for Debian Edu ltsp clients (thin and fat) by calling
+ get-ldap-ltsp-config.
+ - Add share/ltsp/init-ltsp.d/60-edu-nsswitch. For Debian Edu
+ diskless workstations: Modify priority to make KERBEROS work.
+ - Remove now obsolete files:
+ + share/debian-edu-config/ltsp_set_runlevel
+ + share/debian-edu-config/ltsp_local_mount
+ + share/ltsp/ltsp_config.d/debian-edu-config-rwbind
+ + share/ltsp/ltsp_config.d/debian-edu-config-ldap
+ - Comment out lines in 032-edu-pkgs concerning obsoleted files.
+ * Change Makefile to reflect these changes.
-- Wolfgang Schweer <wschweer at arcor.de> Thu, 28 Mar 2013 00:15:27 +0100
Added: branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-nsswitch
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-nsswitch (rev 0)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-nsswitch 2013-03-28 13:48:59 UTC (rev 79505)
@@ -0,0 +1,14 @@
+# For Debian Edu diskless workstations (i.e. ltsp fat clients).
+# As dns service is available, modify priority to make KERBEROS work.
+if boolean_is_true "$LTSP_FATCLIENT"; then
+ sed -i s/compat/ldap\ compat/ /etc/nsswitch.conf
+ sed -i s/files\ my/dns\ files\ my/ /etc/nsswitch.conf
+ sed -i s/netgroups:\ *files/netgroups:\ \ \ \ \ \ ldap\ files/ nsswitch.conf
+fi
+# For Debian Edu diskless workstations (i.e. ltsp fat clients).
+# As dns service is available, modify priority to make KERBEROS work.
+if boolean_is_true "$LTSP_FATCLIENT"; then
+ sed -i s/compat/ldap\ compat/ /etc/nsswitch.conf
+ sed -i s/files\ my/dns\ files\ my/ /etc/nsswitch.conf
+ sed -i s/netgroups:\ *files/netgroups:\ \ \ \ \ \ ldap\ files/ /etc/nsswitch.conf
+fi
Added: 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 (rev 0)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/70-edu-client-core 2013-03-28 13:48:59 UTC (rev 79505)
@@ -0,0 +1,9 @@
+# This snippet modifies /etc/init.d/ltsp-client-core on-the-fly.
+#
+# 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\
+ /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
Modified: branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs 2013-03-28 11:17:27 UTC (rev 79504)
+++ branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs 2013-03-28 13:48:59 UTC (rev 79505)
@@ -289,19 +289,19 @@
# diskless workstation or thin client. Make sure to insert these
# after using only_run_on_rclevel, as the latter do not invoke
# update-rc.d to reorder scripts based on dependencies.
- if [ ! -h $ROOT/etc/init.d/ltsp_set_runlevel ] ; then
- ln -s /usr/share/debian-edu-config/ltsp_set_runlevel \
- $ROOT/etc/init.d/ltsp_set_runlevel
- in_target update-rc.d ltsp_set_runlevel start 99 S .
- fi
+ #if [ ! -h $ROOT/etc/init.d/ltsp_set_runlevel ] ; then
+ # ln -s /usr/share/debian-edu-config/ltsp_set_runlevel \
+ # $ROOT/etc/init.d/ltsp_set_runlevel
+ # in_target update-rc.d ltsp_set_runlevel start 99 S .
+ #fi
# make cdrom and other static local devices work for diskless
# workstation.
- if [ ! -h $ROOT/etc/init.d/ltsp_local_mount ] ; then
- ln -sf /usr/share/debian-edu-config/ltsp_local_mount \
- $ROOT/etc/init.d/ltsp_local_mount
- in_target update-rc.d ltsp_local_mount start 01 3 .
- fi
+ #if [ ! -h $ROOT/etc/init.d/ltsp_local_mount ] ; then
+ # ln -sf /usr/share/debian-edu-config/ltsp_local_mount \
+ # $ROOT/etc/init.d/ltsp_local_mount
+ # in_target update-rc.d ltsp_local_mount start 01 3 .
+ #fi
# Disable the cron jobs that should not be running on a diskless
More information about the debian-edu-commits
mailing list