From 6e61e0b905be28450a3965963fcce18d26385383ac165a1a5ab9a7b1a6940045 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 16 May 2014 18:02:23 +0000
Subject: [PATCH] Accepting request 234345 from
 home:mlatimer:branches:devel:libraries:c_c++

Find device.map in any dir beneath /boot (bnc#875086)

OBS-URL: https://build.opensuse.org/request/show/234345
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/augeas?expand=0&rev=48
---
 augeas-device_map-grub2.patch | 16 ++++++++++++++++
 augeas.changes                |  6 ++++++
 augeas.spec                   |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 augeas-device_map-grub2.patch

diff --git a/augeas-device_map-grub2.patch b/augeas-device_map-grub2.patch
new file mode 100644
index 0000000..810e8d6
--- /dev/null
+++ b/augeas-device_map-grub2.patch
@@ -0,0 +1,16 @@
+Look for device.map in any directory beneath /boot. (This is required
+to find device.map in /boot/grub2 in addition to /boot/grub.)
+
+Index: augeas-1.1.0/lenses/device_map.aug
+===================================================================
+--- augeas-1.1.0.orig/lenses/device_map.aug
++++ augeas-1.1.0/lenses/device_map.aug
+@@ -21,7 +21,7 @@ module Device_map =
+ 
+   let lns = ( empty | comment | map ) *
+ 
+-  let xfm = transform lns (incl "/boot/grub/device.map")
++  let xfm = transform lns (incl "/boot/*/device.map")
+ 
+ (* Local Variables: *)
+ (* mode: caml *)
diff --git a/augeas.changes b/augeas.changes
index 6f1a1af..0c56e5d 100644
--- a/augeas.changes
+++ b/augeas.changes
@@ -86,6 +86,12 @@ Tue May  6 11:04:57 UTC 2014 - tchvatal@suse.com
            Permit spaces after equals sign in list options, GH issue #45
            Split excludes as lists, bug #275
 
+-------------------------------------------------------------------
+Fri May  5 15:55:05 UTC 2014 - mlatimer@suse.com
+
+- device_map lense: Find device.map in any dir beneath /boot (bnc#875086)
+  augeas-device_map-grub2.patch 
+
 -------------------------------------------------------------------
 Fri Dec 13 12:29:08 UTC 2013 - meissner@suse.com
 
diff --git a/augeas.spec b/augeas.spec
index a0ef536..caccc19 100644
--- a/augeas.spec
+++ b/augeas.spec
@@ -29,6 +29,7 @@ Source1:        http://download.augeas.net/augeas-%{version}.tar.gz.sig
 Source2:        %{name}.keyring
 Source3:        baselibs.conf
 Patch0:         augeas-modprobe-lense.patch
+Patch1:         augeas-device_map-grub2.patch
 BuildRequires:  glib2-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  readline-devel
@@ -100,6 +101,7 @@ modifying the official lenses, or when creating new ones.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 export CFLAGS="-Wno-error %{optflags}"