[debian-edu-commits] debian-edu/ 01/02: testsuite/network: cover case that udev persistent network card rules file isn't written at all.

[Wolfgang Schweer]

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

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 96c0dc3813b7e4577d2d6d0f462ac829f3c7ed98
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Nov 1 21:32:48 2014 +0100

    testsuite/network: cover case that udev persistent network card rules file isn't written at all.
---
 debian/changelog  |  3 +++
 testsuite/network | 12 ++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15e5e05..5a277a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
 debian-edu-config (1.814) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
   * Extend grub workaround to automatically handle /dev/vd*, /dev/hd*
     and /dev/xvd* in addition to /dev/sd*, allowing virtual machines
     using virtio, Xen and the old device names to install
     automatically too.
 
+  [ Wolfgang Schweer ]
+
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 01 Nov 2014 07:25:41 +0100
 
 debian-edu-config (1.813) unstable; urgency=medium
diff --git a/testsuite/network b/testsuite/network
index 4782917..8df344c 100755
--- a/testsuite/network
+++ b/testsuite/network
@@ -153,10 +153,14 @@ 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 | 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."
+if [ -f $rules ] ; 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 persistent udev rule for network card found."
+    fi
+    else
+	success "no network card related udev rules problem; file wasn't even created."
 fi
 
 exit 0

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