From 666ad8a3c7a422ff8a3cde321fb34492cde90a36 Mon Sep 17 00:00:00 2001

From: Mike Latimer <mlatimer@suse.com>

Date: Mon, 5 May 2014 13:08:14 -0600

Subject: [PATCH] Device_map: Parse all device.map files under /boot

(cherry picked from commit 6ee12b6a705cc5da3558847fe4782e2ac30bcc10)

Conflicts:

	AUTHORS

	NEWS

---

 AUTHORS               | 1 +

 lenses/device_map.aug | 2 +-

 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS

index 36e045e..146c691 100644

--- a/AUTHORS

+++ b/AUTHORS

@@ -94,3 +94,4 @@ Contributions by:

   Mathieu Alorent             <malorent@kumy.net>

   Rob Tucker                  <rtucker@mozilla.com>

   Pino Toscano                <ptoscano@redhat.com>

+  Mike Latimer                <mlatimer@suse.com>

diff --git a/lenses/device_map.aug b/lenses/device_map.aug

index cb43206..bd1825d 100644

--- a/lenses/device_map.aug

+++ b/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 *)