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

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-02-04 16:41:12 +0000 (Mon, 04 Feb 2013)
New Revision: 78976

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist
   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/098-etckeeper
Log:
Fix some ltsp related scripts: path of etckeeper, release name. 

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-02-04 16:22:56 UTC (rev 78975)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-02-04 16:41:12 UTC (rev 78976)
@@ -2,6 +2,7 @@
 
   * 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. 
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 04 Feb 2013 17:19:04 +0100
 

Modified: branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist	2013-02-04 16:22:56 UTC (rev 78975)
+++ branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist	2013-02-04 16:41:12 UTC (rev 78976)
@@ -2,7 +2,7 @@
     configure)
         if [  "$DIST" = "n/a" ]; then
             # set distribution if lsb_release failed to figure it out
-            DIST=squeeze
+            DIST=wheezy
             echo "Note: setting distribution to $DIST, as auto-detection failed."
         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-02-04 16:22:56 UTC (rev 78975)
+++ branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs	2013-02-04 16:41:12 UTC (rev 78976)
@@ -122,10 +122,10 @@
 
 etcvcs_commit() {
     msg="$1"
-    if [ -x $ROOT/usr/sbin/etckeeper ] ; then
+    if [ -x $ROOT/usr/bin/etckeeper ] ; then
 	in_target etckeeper commit "$msg" || true
     fi
-    if [ -x /usr/sbin/etckeeper ] ; then
+    if [ -x /usr/bin/etckeeper ] ; then
 	etckeeper commit "$msg" || true
     fi
 }

Modified: branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/098-etckeeper
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/098-etckeeper	2013-02-04 16:22:56 UTC (rev 78975)
+++ branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/098-etckeeper	2013-02-04 16:41:12 UTC (rev 78976)
@@ -4,7 +4,7 @@
             EARLY_PACKAGES="$EARLY_PACKAGES etckeeper"
             ;;
     finalization)
-            if [ -x /usr/sbin/etckeeper ] ; then
+            if [ -x /usr/bin/etckeeper ] ; then
                 etckeeper commit "End of ltsp-build-client process" || true
             fi
             ;;