From 13c932106f5ad9dfa50b053cb17579846098c19103ed33ca12841ea3f3e07ecd Mon Sep 17 00:00:00 2001
From: Petr Uzel <puzel@suse.com>
Date: Wed, 20 Jun 2012 11:15:52 +0000
Subject: [PATCH] Accepting request 125509 from
 home:lnussel:branches:Base:System

add a hack for boot.localfs to determine the devices to wait for
(uses mount -avn).
yes it's an ugly hack that will never make it upstream but it's the
least intrustive workaround I could come up with atm. Suggestions
welcome though :-)

OBS-URL: https://build.opensuse.org/request/show/125509
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=142
---
 util-linux-HACK-boot.localfs.diff | 27 +++++++++++++++++++++++++++
 util-linux.changes                |  5 +++++
 util-linux.spec                   |  5 +++++
 3 files changed, 37 insertions(+)
 create mode 100644 util-linux-HACK-boot.localfs.diff

diff --git a/util-linux-HACK-boot.localfs.diff b/util-linux-HACK-boot.localfs.diff
new file mode 100644
index 0000000..a5f7844
--- /dev/null
+++ b/util-linux-HACK-boot.localfs.diff
@@ -0,0 +1,27 @@
+From 89a0fa3ca57be7440500dd207d96ea1e2908959f Mon Sep 17 00:00:00 2001
+From: Ludwig Nussel <ludwig.nussel@suse.de>
+Date: Wed, 20 Jun 2012 10:56:05 +0200
+Subject: [PATCH] UGLY HACK: boot.localfs parses mount ouput and needs source
+ rather than target
+
+---
+ sys-utils/mount.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/sys-utils/mount.c b/sys-utils/mount.c
+index 8706716..b28d67a 100644
+--- a/sys-utils/mount.c
++++ b/sys-utils/mount.c
+@@ -166,6 +166,9 @@ static int mount_all(struct libmnt_context *cxt)
+ 	while (mnt_context_next_mount(cxt, itr, &fs, &mntrc, &ignored) == 0) {
+ 
+ 		const char *tgt = mnt_fs_get_target(fs);
++		if (getenv("MOUNT_PRINT_SOURCE")) {
++			tgt = mnt_fs_get_srcpath(fs);
++		}
+ 
+ 		if (ignored) {
+ 			if (mnt_context_is_verbose(cxt))
+-- 
+1.7.7
+
diff --git a/util-linux.changes b/util-linux.changes
index 67e5dde..686d3ac 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 20 09:22:50 UTC 2012 - lnussel@suse.de
+
+- add a hack for boot.localfs to determine the devices to wait for
+
 -------------------------------------------------------------------
 Fri Jun 15 12:57:06 UTC 2012 - puzel@suse.com
 
diff --git a/util-linux.spec b/util-linux.spec
index e346fa6..6959f8d 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -101,6 +101,9 @@ Patch10:        mount-new-add-loopdev-specific-error-message.patch
 # disable encryption
 Patch11:        util-linux-2.21.2-noenc.diff
 Patch12:        util-linux-2.21.2-noenc-suse.diff
+
+# hack for boot.localfs
+Patch20:        util-linux-HACK-boot.localfs.diff
 #####
 
 ##
@@ -213,6 +216,8 @@ Files to develop applications using the libmount library.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+#
+%patch20 -p1
 
 #
 cd adjtimex-*