[debian-edu-commits] r79416 - in branches/wheezy/debian-edu-config: debian share/ltsp/plugins/ltsp-build-client/Debian-custom testsuite

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-03-18 19:41:32 +0000 (Mon, 18 Mar 2013)
New Revision: 79416

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
   branches/wheezy/debian-edu-config/testsuite/ltsp
Log:
* 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 
    values taken from the server side debconf data base.
  - 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 
  but not a fqdn has been set in GOsa.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-03-18 06:57:22 UTC (rev 79415)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-03-18 19:41:32 UTC (rev 79416)
@@ -1,3 +1,17 @@
+debian-edu-config (1.704~svn) UNRELEASED; urgency=low
+
+  * 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 
+      values taken from the server side debconf data base.
+    - 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 
+    but not a fqdn has been set in GOsa.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 18 Mar 2013 19:51:38 +0100
+
 debian-edu-config (1.703) unstable; urgency=low
 
   * uploaded to the Debian Edu archive as 1.703~svn79344:

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-18 06:57:22 UTC (rev 79415)
+++ branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs	2013-03-18 19:41:32 UTC (rev 79416)
@@ -148,6 +148,15 @@
         debconf-get-selections | egrep "^locales"
     ) | in_target debconf-set-selections
 
+    # Set same default-wordlist and default-ispell as on the server side
+    (
+        debconf-get-selections | egrep "^dictionaries-common" | grep default-wordlist
+    ) | in_target debconf-set-selections
+
+    (
+        debconf-get-selections | egrep "^dictionaries-common" | grep default-ispell
+    ) | in_target debconf-set-selections
+
     if [ -f /etc/locale.gen -a ! -f $ROOT/locale.gen ] ; then
         cp /etc/locale.gen $ROOT/etc/locale.gen
     fi
@@ -198,7 +207,7 @@
 
     info "installing packages the same way tasksel do it"
 
-    # Query tasksel for its aptitude command, and use it directly to
+    # Query tasksel for its apt-get command, and use it directly to
     # get output from the process.
     diverts_insert
     cmd="$(LANG=$LANG in_target tasksel -t --new-install | sed 's/debconf-apt-progress -- //')"
@@ -211,29 +220,29 @@
     fi
 
     # Get rid of lvm2, as it causes the shutdown to hang.
-    in_target aptitude -y purge lvm2
+    in_target apt-get -y purge lvm2
 
     # Get rid of some network services we do not want on diskless
     # workstations
-    in_target aptitude -y purge munin-node xfs
+    in_target apt-get -y purge munin-node xfs
 
     # LTSP take care of updating resolv.conf, no need to have
     # resolvconf try to do the same.
-    in_target aptitude -y purge resolvconf
+    in_target apt-get -y purge resolvconf
 
     # No dynamic network configuration on diskless clients.
-    in_target aptitude -y purge network-manager wpasupplicant \
+    in_target apt-get -y purge network-manager wpasupplicant \
 	network-manager-openvpn network-manager-pptp network-manager-vpnc \
 	openvpn
 
     # No VPN nor serial network either
-    in_target aptitude -y purge ppp
+    in_target apt-get -y purge ppp
 
     # Missing unique ID on the clients, so no use keeping it around
-    in_target aptitude -y purge popularity-contest
+    in_target apt-get -y purge popularity-contest
 
     # Probably not very useful without a disk
-    in_target aptitude -y purge readahead readahead-fedora hdparm hddtemp
+    in_target apt-get -y purge readahead readahead-fedora hdparm hddtemp
 
     # Remove dependencies pulled in by removed packages
     in_target apt-get -y autoremove
@@ -404,7 +413,7 @@
                 (
                     echo 'APT::Get::AllowUnauthenticated "true";'
                     echo 'APT::Authentication::TrustCDROM "true";'
-                    echo 'Aptitude::Cmdline::ignore-trust-violations "true";'
+                    echo 'APT::Cmdline::ignore-trust-violations "true";'
                 ) >> $ROOT/etc/apt/apt.conf.d/90ltsp-build-client
             fi
 

Modified: branches/wheezy/debian-edu-config/testsuite/ltsp
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/ltsp	2013-03-18 06:57:22 UTC (rev 79415)
+++ branches/wheezy/debian-edu-config/testsuite/ltsp	2013-03-18 19:41:32 UTC (rev 79416)
@@ -103,8 +103,10 @@
 
     # Test if the LTSP chroots can be NFS mounted
     myname=$(uname -n)
+    # Workaround: use IP, just in case fqdn is not set in GOsa.
+    myip=$(host "$myname"|cut -d" " -f4)
     for m in $(showmount -e | grep /opt/ltsp | awk '{print $1}') ; do
-	if mount $myname:$m /mnt; then
+	if mount $myip:$m /mnt; then
 	    echo "success: $0: mounting $myname:$m succeeded"
 	    umount /mnt
 	else