[debian-edu-commits] r82242 - in branches/wheezy/debian-edu-config: debian etc/resolvconf/update.d share/ltsp/init-ltsp.d

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-28 11:11:20 +0000 (Wed, 28 Aug 2013)
New Revision: 82242

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/etc/resolvconf/update.d/ltsp-chroots
   branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws
Log:
Move code to update proxy settings in the LTSP chroot from
init-ltsp.d/60-edu-diskless-ws to
resolvconf/update.d/ltsp-chroots, to do it when DNS settings
change instead of every client boot.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-28 10:30:08 UTC (rev 82241)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-28 11:11:20 UTC (rev 82242)
@@ -17,6 +17,10 @@
     LTSP clients from init-ltsp.d/60-edu-diskless-ws to cf/cf.ntp, to
     make sure it is only done once during installation and not every
     time a client boot.
+  * Move code to update proxy settings in the LTSP chroot from
+    init-ltsp.d/60-edu-diskless-ws to
+    resolvconf/update.d/ltsp-chroots, to do it when DNS settings
+    change instead of every client boot.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 26 Aug 2013 23:09:49 +0200
 

Modified: branches/wheezy/debian-edu-config/etc/resolvconf/update.d/ltsp-chroots
===================================================================
--- branches/wheezy/debian-edu-config/etc/resolvconf/update.d/ltsp-chroots	2013-08-28 10:30:08 UTC (rev 82241)
+++ branches/wheezy/debian-edu-config/etc/resolvconf/update.d/ltsp-chroots	2013-08-28 11:11:20 UTC (rev 82242)
@@ -16,12 +16,23 @@
 
 for f in /opt/ltsp/*/etc/resolv.conf ; do
     if [ -f "$f" ] && ! cmp -s $f $sourcefile ; then
-	msg="Updating LTSP DNS config (cp $sourcefile $f)"
+	arch=$(echo $f | cut -d/ -f4)
+	msg="Updating LTSP DNS config for $arch (cp $sourcefile $f)"
 	# Ignore errors in case /usr/bin with logger is not yet
 	# mounted
 	logger -t debian-edu-config "$msg" 2>/dev/null || true
 	echo "$msg"
 	cp $sourcefile $f
 	chmod 644 $f
+
+        # Fix proxy settings too, as they depend on DNS resolution.
+	msg="Updating LTSP proxy setup for $arch"
+	logger -t debian-edu-config "$msg" 2>/dev/null || true
+	echo "$msg"
+	for f in /etc/environment /etc/apt/apt.conf ; do
+	    newf=/opt/ltsp/$arch$f
+	    cp $f $newf
+	    chmod 644 $newf
+	done
     fi
 done

Modified: branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws	2013-08-28 10:30:08 UTC (rev 82241)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws	2013-08-28 11:11:20 UTC (rev 82242)
@@ -10,6 +10,4 @@
             update-rc.d $service enable 2 >/dev/null  2>&1
         done
     fi
-    # Fix proxy settings.
-    /usr/share/debian-edu-config/tools/update-proxy-from-wpad
 fi