[debian-edu-commits] debian-edu/ 01/01: Make it easier to enable a test intallation by adding 'testinstall' on the d-i kernel argument line.

[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 51d206945b35e91fcf5c8ba1ae4d11405fff2b7e
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Oct 23 17:54:10 2014 +0200

    Make it easier to enable a test intallation by adding 'testinstall' on the d-i kernel argument line.
---
 debian/changelog         | 7 +++++++
 tools/edu-is-testinstall | 1 +
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7d96cea..d793781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-install (1.815) UNRELEASED; urgency=low
+
+  * Make it easier to enable a test intallation by adding 'testinstall'
+    on the d-i kernel argument line.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 23 Oct 2014 17:53:51 +0200
+
 debian-edu-install (1.814) unstable; urgency=medium
 
   * Mention jessie in internal template in
diff --git a/tools/edu-is-testinstall b/tools/edu-is-testinstall
index 006165d..f53bde4 100755
--- a/tools/edu-is-testinstall
+++ b/tools/edu-is-testinstall
@@ -15,6 +15,7 @@ EARLYCMD="$RET"
 
 if [ -f /tmp/debian-edu-profile-udeb-testinstall ] || \
    grep -iq "/$CDDISTRIBUTION-test" /cdrom/.disk/mkisofs 2>/dev/null || \
+   grep -q testinstall /proc/cmdline || \
    echo "$EARLYCMD" | grep -iq "/$DISTRIBUTION-test/" ; then
     logger -t edu-is-testinstall "detected test install"
     touch /tmp/debian-edu-profile-udeb-testinstall

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