Merge "Add grub template to cobbler for MAC-files"

[armband.git] / patches / fuel-nailgun-agent / 0001-ohai-Support-reading-L1-info-from-ethtool.patch

diff --git a/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch b/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch
index 911001f..5239554 100644 (file)
--- a/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch
+++ b/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch
@@ -14,19 +14,18 @@ supports parsing ethtool speed starting with version amos2 [1].
 [1] https://linux.enea.com/mos-repos/ubuntu/8.0/pool/main/o/
     ohai/ohai_6.14.0-2~u14.04+mos1+mos8.0+amos2_all.deb
 ---
- ...ohai-Support-reading-L1-info-from-ethtool.patch | 34 ++++++++++++++++++++++
+ ...ohai-Support-reading-L1-info-from-ethtool.patch | 30 ++++++++++++++++++++++
  debian/patches/series                              |  1 +
- 2 files changed, 35 insertions(+)
+ 2 files changed, 31 insertions(+)
  create mode 100644 debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch
  create mode 100644 debian/patches/series
 
 diff --git a/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch b/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch
 new file mode 100644
-index 0000000..aa50ea4
+index 0000000..8ae8c49
 --- /dev/null
 +++ b/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch
-@@ -0,0 +1,34 @@
-+From 942c67f74c00b1097d1ad27ece79fe91b475190c Mon Sep 17 00:00:00 2001
+@@ -0,0 +1,30 @@
 +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 +Date: Sat, 2 Apr 2016 22:54:27 +0200
 +Subject: [PATCH] ohai: Support reading L1 info from ethtool.
@@ -57,9 +56,6 @@ index 0000000..aa50ea4
 +             end
 +           elsif (addrinfo[:family] rescue nil) =~ /^inet$/
 +             int_meta[:ip] = addr
-+--
-+1.9.1
-+
 diff --git a/debian/patches/series b/debian/patches/series
 new file mode 100644
 index 0000000..b221a98