[debian-edu-commits] r79592 - in branches/wheezy/debian-edu-config: debian sbin 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
Tue Apr 2 17:31:46 UTC 2013 

Author: schweer-guest
Date: 2013-04-02 17:31:46 +0000 (Tue, 02 Apr 2013)
New Revision: 79592

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
   branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-nsswitch
   branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
Log:
* Some more steps to get both thin and fat LTSP client setup working:
  - Correct type error in debian-edu-pxe-install.
  - Remove duplicate code from 60-edu-nsswitch.
  - Comment out most lines concerning runlevels in 32-edu-pkgs, cause 
    there's no need to change the runlevel defaults anymore.
    Now the default runlevel for both client types is 2, the
    init-ltsp process will start processes depending from the client
    type chosen.  (Client type: LTSP_FATCLIENT=True is set by
    default, for thin clients this has to be set to 'False' via
    kernel command line, lts.conf or LDAP entry.)
* Changelog: Remove useless whitespace.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-02 04:58:04 UTC (rev 79591)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-02 17:31:46 UTC (rev 79592)
@@ -1,18 +1,32 @@
 debian-edu-config (1.704~svn79535) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * Use my @debian.org mail address in Uploaders: field.
   * Fix passwd sync in Samba. (Closes: #656296).
   * The change-over to using an aufs overlay on diskless
     workstations fixes observed failures of the udisks daemon.
     (Closes: #629054, #629055).
 
+  [ Wolfgang Schweer ]
+  * Some more steps to get both thin and fat LTSP client setup working:
+    - Correct type error in debian-edu-pxe-install.
+    - Remove duplicate code from 60-edu-nsswitch.
+    - Comment out most lines concerning runlevels in 32-edu-pkgs, cause 
+      there's no need to change the runlevel defaults anymore.
+      Now the default runlevel for both client types is 2, the
+      init-ltsp process will start processes depending from the client
+      type chosen.  (Client type: LTSP_FATCLIENT=True is set by
+      default, for thin clients this has to be set to 'False' via
+      kernel command line, lts.conf or LDAP entry.)
+  * Changelog: Remove useless whitespace.
+
  -- Mike Gabriel <sunweaver at debian.org>  Mon, 01 Apr 2013 15:26:19 +0200
 
 debian-edu-config (1.704~svn79534) wheezy-test; urgency=low
 
   [ Wolfgang Schweer ]
   * testsuite/ltsp: Replace /etc/ltsp_chroot with /etc/lts.conf to
-    test if the ltsp chroot exists, as ltsp_chroot seems to have 
+    test if the ltsp chroot exists, as ltsp_chroot seems to have
     been dropped.
   * debian-edu-pxeinstall:
     - Change kernel command lines to reflect new ltsp init process.
@@ -24,14 +38,14 @@
     - 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 
+    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 
+    - 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 
+    - 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
@@ -49,11 +63,11 @@
   * ltsp-build-client (used by d-i ltsp-client-builder.udeb).
     Change configuration to fix ltsp chroot installation:
     - Preseed dictionaries-common/default-wordlist and default-ispell
-      in /usr/share/ltsp/plugins/Debian-custom/032-edu-pkgs with 
+      in /usr/share/ltsp/plugins/Debian-custom/032-edu-pkgs with
       values taken from the server side debconf data base.
-    - Replace aptitude (in 032-edu-pkgs) by apt-get to avoid failure 
+    - Replace aptitude (in 032-edu-pkgs) by apt-get to avoid failure
       due to missing aptitude.
-  * testsuite/ltsp: Use IP for NFS mount just in case only a hostname 
+  * testsuite/ltsp: Use IP for NFS mount just in case only a hostname
     but not a fqdn has been set in GOsa.
 
  -- Holger Levsen <holger at debian.org>  Mon, 25 Mar 2013 14:52:42 +0100
@@ -74,10 +88,10 @@
   [ Wolfgang Schweer ]
   * Drop setting "allow_weak_crypro = true" in /etc/krb5.conf. Thanks
     to Andreas B. Mundt for the hint.
-  * Fix some ltsp related scripts: path of etckeeper, release name. 
+  * Fix some ltsp related scripts: path of etckeeper, release name.
   * Fix dovecot setup:
     - Don't modify configfiles
-    - Put Debian Edu specific settings into /etc/dovecot/local.conf 
+    - Put Debian Edu specific settings into /etc/dovecot/local.conf
     - Add dovecot/local.conf
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-04-02 04:58:04 UTC (rev 79591)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-04-02 17:31:46 UTC (rev 79592)
@@ -314,7 +314,7 @@
 
 EOF
 	cat > $tftpdir/debian-edu/default-diskless.cfg <<EOF
-DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=$ltsproot boot=nfs ro quiet epappend 2
+DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=$ltsproot boot=nfs ro quiet ipappend 2
 EOF
     fi
 fi

Modified: 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	2013-04-02 04:58:04 UTC (rev 79591)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-nsswitch	2013-04-02 17:31:46 UTC (rev 79592)
@@ -5,10 +5,3 @@
     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

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-04-02 04:58:04 UTC (rev 79591)
+++ branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs	2013-04-02 17:31:46 UTC (rev 79592)
@@ -264,17 +264,17 @@
     # a lot of services should only be started in runlevel 3, eg, when
     # running in workstation mode.  Portmap should not start in rcS.d,
     # to avoid it on thin clients.
-    enable_on_rclevel portmap 3
-    enable_on_rclevel nfs-common 3
-    enable_on_rclevel dbus 3
-    enable_on_rclevel hal 3
-    only_run_on_rclevel 3 gdm kdm xdm nscd cupsys autofs pulseaudio \
+    #enable_on_rclevel portmap 3
+    #enable_on_rclevel nfs-common 3
+    #enable_on_rclevel dbus 3
+    #enable_on_rclevel hal 3
+    #only_run_on_rclevel 3 gdm kdm xdm nscd cupsys autofs pulseaudio \
         portmap nfs-common nslcd rwhod saned cups timidity jackd cron \
         speech-dispatcher binfmt-support avahi-daemon bluetooth
 
     # a lot of services should only be started in runlevel 4, eg. when running
     # in thin client mode
-    only_run_on_rclevel 4 ltsp-client samba ltsp-client-core
+    #only_run_on_rclevel 4 ltsp-client samba ltsp-client-core
 
     # Some services should not be started on the terminals
     only_run_on_rclevel N enable-nat \

More information about the debian-edu-commits mailing list