[debian-edu-commits] debian-edu/ 01/01: Correct check for bug #765577 (duplicate udev rules for network card) to also work when more than one network card is present in the machine.

[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 4c421aeb392fb9a6c0b7e28857fe2c9cc24b29fe
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Oct 24 09:29:44 2014 +0200

    Correct check for bug #765577 (duplicate udev rules for network card) to also work when more than one network card is present in the machine.
---
 debian/changelog  | 3 +++
 testsuite/network | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e8cb6f6..fa5ba1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ debian-edu-config (1.813) UNRELEASED; urgency=low
   * Adjust 000-arch-detection LTSP script to set http_proxy from the APT
     setup before calling wget, in case the proxy is needed to reach the
     Internet.
+  * Correct check for bug #765577 (duplicate udev rules for network
+    card) to also work when more than one network card is present in the
+    machine.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 23 Oct 2014 10:35:10 +0200
 
diff --git a/testsuite/network b/testsuite/network
index 00d53e4..4782917 100755
--- a/testsuite/network
+++ b/testsuite/network
@@ -153,7 +153,7 @@ fi
 
 # Look for bug #765577, duplicate udev entries.
 rules=/etc/udev/rules.d/70-persistent-net.rules
-if [ 1 -lt "$(sed -rn 's/^(SUBSYSTEM=="net", .*)NAME=.*$/\1/p' $rules | sort | uniq -c | awk '{ print $1; exit}')" ] ; then
+if [ 1 -lt "$(sed -rn 's/^(SUBSYSTEM=="net", .*)NAME=.*$/\1/p' $rules | sort | uniq -c | sort -nr | awk '{ print $1; exit}')" ] ; then
     error "duplicate persistent udev rules for network card in $rules (bug #765577)."
 else
     success "no duplicate presistent udev rule for network card found."

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