[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] etc/shutdown-at-night/clients-generator: Support recent output of ifconfig…

[Mike Gabriel]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
f399ad74 by Mike Gabriel at 2018-12-11T21:19:37Z
etc/shutdown-at-night/clients-generator: Support recent output of ifconfig (where the MAC address comes in the second row of one's interface output and is prefixed by "^ether ...".

- - - - -


2 changed files:

- debian/changelog
- etc/shutdown-at-night/clients-generator


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+debian-edu-config (2.10.50) UNRELEASED; urgency=medium
+
+  * etc/shutdown-at-night/clients-generator: Support recent output
+    of ifconfig (where the MAC address comes in the second row of
+    one's interface output and is prefixed by "^ether ...".
+
+ -- Mike Gabriel <sunweaver at debian.org>  Tue, 11 Dec 2018 22:13:23 +0100
+
 debian-edu-config (2.10.49) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
etc/shutdown-at-night/clients-generator
=====================================
@@ -58,7 +58,10 @@ sub get_ether_hwaddr {
         my @hwaddr = ();
         while (<FILE>) {
             chomp;
-            if (m/Link encap:Ethernet  HWaddr (.+\S)\s*$/) {
+            if (m/ether (([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2}))\s+.*$/) {
+                push(@hwaddr, $1);
+            }
+            elsif (m/Link encap:Ethernet  HWaddr (.+\S)\s*$/) {
                 push(@hwaddr, $1);
             }
         }



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/f399ad7477f8d9462a299eae053c607576b51cf9

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/f399ad7477f8d9462a299eae053c607576b51cf9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20181211/41b24572/attachment.html>