[debian-edu-commits] debian-edu/ 01/02: Adjust debian-edu-pxeinstall to sort the preseeding values, to get predictable ordering and avoid bogus changes reported by etckeeper.

[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-config.

commit 013160db66b4595b35f3b165474697c69bb3f4f9
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Sep 20 05:07:16 2014 +0200

    Adjust debian-edu-pxeinstall to sort the preseeding values, to get predictable ordering and avoid bogus changes reported by etckeeper.
---
 debian/changelog           | 5 +++++
 sbin/debian-edu-pxeinstall | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3b56c89..3367e5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 debian-edu-config (1.803) UNRELEASED; urgency=high
 
+  [ Wolfgang Schweer ]
   * share/ltsp/init-ltsp.d/60-edu-diskless-ws:
     Stop using update-rc.d to disable the automounter if the homedir is
     mounted via sshfs as this isn't stable. Do it the way ltsp does.
 
+  [ Petter Reinholdtsen ]
+  * Adjust debian-edu-pxeinstall to sort the preseeding values, to get
+    predictable ordering and avoid bogus changes reported by etckeeper.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 18 Sep 2014 11:29:19 +0200
 
 debian-edu-config (1.802) unstable; urgency=medium
diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall
index 72f064a..ae1a92e 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -247,7 +247,7 @@ choose-mirror-bin     mirror/http/hostname    string  http.debian.net
 choose-mirror-bin     mirror/http/directory   string  /debian
 EOF
     else
-	debconf-get-selections --installer | egrep -w 'mirror/country|mirror/protocol|mirror/http/hostname|mirror/http/directory|mirror/ftp/hostname|mirror/ftp/directory'
+	debconf-get-selections --installer | egrep -w 'mirror/country|mirror/protocol|mirror/http/hostname|mirror/http/directory|mirror/ftp/hostname|mirror/ftp/directory' | sort
     fi
 
     # Make it easier to have local overrides and still be able to

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