[debian-edu-commits] debian-edu/ 01/01: Add logging and predict apt config loading in edu-eatmydata-install.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-install.

commit c15bb65458db74f786d313283c86e6026912a6c9
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Sep 24 12:14:13 2014 +0200

    Add logging and predict apt config loading in edu-eatmydata-install.
---
 tools/edu-eatmydata-install | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/edu-eatmydata-install b/tools/edu-eatmydata-install
index b09aab9..4dadf3c 100755
--- a/tools/edu-eatmydata-install
+++ b/tools/edu-eatmydata-install
@@ -19,12 +19,12 @@ trap at_exit INT TERM EXIT
 enable_override() {
     apt-install eatmydata || true
     if [ -x /target/usr/bin/eatmydata ] && \
-	[ ! -f /target/etc/apt/apt.conf.d/debian-edu-install-dpkg-eatmydata ]; then
-        # Add apt config to call dpkg via eatmydata
+	[ ! -f /target/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata ]; then
+        info "Adding apt config to call dpkg via eatmydata"
         printf "#!/bin/sh\neatmydata dpkg \"\$@\"\n" \
             > /target/var/tmp/dpkg-eatmydata
         chmod 755 /target/var/tmp/dpkg-eatmydata
-	cat > /target/etc/apt/apt.conf.d/debian-edu-install-dpkg-eatmydata <<EOF
+        cat > /target/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata <<EOF
 Dir::Bin::dpkg "/var/tmp/dpkg-eatmydata";
 EOF
     else
@@ -34,8 +34,9 @@ EOF
 
 disable_override() {
     for override in \
-	/etc/apt/apt.conf.d/debian-edu-install-dpkg-eatmydata \
+	/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata \
 	/var/tmp/dpkg-eatmydata ; do
+	info "Removing apt config to call dpkg via eatmydata"
 	if [ -f /target$override ] ; then
             rm -f /target$override
 	else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git