[debian-edu-commits] r78944 - in branches/wheezy/debian-edu-install: debian tools

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-02-01 17:39:36 +0000 (Fri, 01 Feb 2013)
New Revision: 78944

Modified:
   branches/wheezy/debian-edu-install/debian/changelog
   branches/wheezy/debian-edu-install/tools/edu-etcvcs
Log:
Fix path to etckeeper (now in /usr/bin instead of /usr/sbin).

Modified: branches/wheezy/debian-edu-install/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-install/debian/changelog	2013-02-01 17:36:09 UTC (rev 78943)
+++ branches/wheezy/debian-edu-install/debian/changelog	2013-02-01 17:39:36 UTC (rev 78944)
@@ -1,3 +1,9 @@
+debian-edu-install (1.703+nmu1) UNRELEASED; urgency=low
+
+  * Fix path to etckeeper (now in /usr/bin instead of /usr/sbin).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 01 Feb 2013 18:37:02 +0100
+
 debian-edu-install (1.703) unstable; urgency=low
 
   [ David Prévot ]

Modified: branches/wheezy/debian-edu-install/tools/edu-etcvcs
===================================================================
--- branches/wheezy/debian-edu-install/tools/edu-etcvcs	2013-02-01 17:36:09 UTC (rev 78943)
+++ branches/wheezy/debian-edu-install/tools/edu-etcvcs	2013-02-01 17:39:36 UTC (rev 78944)
@@ -16,21 +16,21 @@
 
 commit() {
     info "Running etckeeper commit"
-    if [ -x /target/usr/sbin/etckeeper ] ; then
-	in-target /usr/sbin/etckeeper \
+    if [ -x /target/usr/bin/etckeeper ] ; then
+	in-target /usr/bin/etckeeper \
 	    commit "Automatic commit during installation" || true
     fi
 }
 
 init() {
-    if [ -x /target/usr/sbin/etckeeper ] && [ -d /target/etc/.git ]; then
+    if [ -x /target/usr/bin/etckeeper ] && [ -d /target/etc/.git ]; then
 	return
     fi
     apt-install etckeeper || true
-    if [ -x /target/usr/sbin/etckeeper ] ; then
-        if in-target /usr/sbin/etckeeper init ; then
-            in-target /usr/sbin/etckeeper vcs config --global user.name "Local Administrator"
-	    in-target /usr/sbin/etckeeper vcs config --global user.email "root at localhost"
+    if [ -x /target/usr/bin/etckeeper ] ; then
+        if in-target /usr/bin/etckeeper init ; then
+            in-target /usr/bin/etckeeper vcs config --global user.name "Local Administrator"
+	    in-target /usr/bin/etckeeper vcs config --global user.email "root at localhost"
 	else
 	    info "Running etckeeper init failed"
 	fi