[debian-edu-commits] debian-edu/ 01/01: Use isenkram instead of discover to report packages to install for the current hardware in the hardware check in the test suite. Drop discover from dependencies.

[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 954627401fb833878c291bdc4734853d231f14dc
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Oct 21 21:59:13 2014 +0200

    Use isenkram instead of discover to report packages to install for the current hardware in the hardware check in the test suite. Drop discover from dependencies.
---
 debian/changelog   |  3 +++
 debian/control     |  1 -
 testsuite/hardware | 13 +++----------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb1e7a9..e6161a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ debian-edu-config (1.812) UNRELEASED; urgency=low
     wrong name in the network testsuite check.
   * Raise dependency on education-tasks to (>= 1.808), to ensure we get
     the Jessie tasks.
+  * Use isenkram instead of discover to report packages to install for
+    the current hardware in the hardware check in the test suite.
+    Drop discover from dependencies.
 
   [ Holger Levsen ]
   * Drop debian-edu-config-gosa-netgroups binary package as our fork is now
diff --git a/debian/control b/debian/control
index 2b65975..e5254e6 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Depends: ${misc:Depends},
          debconf-utils,
          debian-edu-artwork,
          desktop-profiles,
-         discover,
          education-tasks (>= 1.808),
          fping,
          host,
diff --git a/testsuite/hardware b/testsuite/hardware
index 7a870ca..f5caebd 100755
--- a/testsuite/hardware
+++ b/testsuite/hardware
@@ -2,16 +2,6 @@
 #
 # Report the detected HW
 
-if [ -x /sbin/discover ] ; then
-    if /sbin/discover --version | grep " 1\." >/dev/null 2>&1; then
-	/sbin/discover -f "info: $0: discover: %m;%S;%D;%V;%M;%d\n" all || true
-    else
-	echo "info: discover v2 installed"
-    fi
-else
-    echo "error: $0: Unable to find /sbin/discover"
-fi
-
 LSPCI=/sbin/lspci
 if [ -x /usr/bin/lspci ] ; then
     LSPCI=/usr/bin/lspci # This is the location in Sarge [2005-01-30]
@@ -61,3 +51,6 @@ elif [ -x /usr/bin/ddccontrol ] ; then
 else
     echo "error: $0: Unable to find /usr/sbin/ddcprobe and /usr/bin/ddccontrol"
 fi
+
+isenkram-lookup | sed "s%^%info: $0: isenkram-lookup: %"
+isenkram-autoinstall-firmware -l | sed "s%^%info: $0: isenkram-autoinstall-firmware: %"

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