From 4101c712d5f6e572436d1dc17f8900b11d1ffe726e5260b37b7f9a4281811473 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 24 Jul 2013 14:43:23 +0000
Subject: [PATCH] Accepting request 184080 from home:olh:branches:Base:System

- Remove usage of absolute paths in initrd
- Remove some checks from mkinitrd scripts, they are always true
- List all used binaries in programs tag

OBS-URL: https://build.opensuse.org/request/show/184080
OBS-URL: https://build.opensuse.org/package/show/Base:System/dmraid?expand=0&rev=30
---
 dmraid.changes    | 7 +++++++
 dmraid.spec       | 2 +-
 mkinitrd-boot.sh  | 5 +++--
 mkinitrd-setup.sh | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dmraid.changes b/dmraid.changes
index ed262e4..3cb9ab2 100644
--- a/dmraid.changes
+++ b/dmraid.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul 23 14:38:15 CEST 2013 - ohering@suse.de
+
+- Remove usage of absolute paths in initrd
+- Remove some checks from mkinitrd scripts, they are always true
+- List all used binaries in programs tag
+
 -------------------------------------------------------------------
 Wed Nov 28 12:07:36 UTC 2012 - rmilasan@suse.com
 
diff --git a/dmraid.spec b/dmraid.spec
index 678e940..cbd46cb 100644
--- a/dmraid.spec
+++ b/dmraid.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dmraid
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh
index 96c9e39..abc9b7f 100644
--- a/mkinitrd-boot.sh
+++ b/mkinitrd-boot.sh
@@ -2,7 +2,8 @@
 #%stage: block
 #%depends: dm
 #%provides: dmroot
-#%programs: /sbin/dmraid
+#%programs: dmraid
+#%programs: mkdir
 #%if: -n "$root_dmraid"
 #
 ##### Device Mapper Raid
@@ -17,6 +18,6 @@
 ## 
 
 [ -d /run/lock ] || mkdir -p /run/lock >/dev/null 2>&1
-/sbin/dmraid -a y -p
+dmraid -a y -p
 wait_for_events
 
diff --git a/mkinitrd-setup.sh b/mkinitrd-setup.sh
index a14c67f..117ae3d 100644
--- a/mkinitrd-setup.sh
+++ b/mkinitrd-setup.sh
@@ -4,7 +4,7 @@
 #%provides: dmroot
 #
 
-if [ -x /sbin/dmraid -a -x /sbin/dmsetup ] ; then
+if [ -x "$(type -p dmsetup)" ] ; then
 	newbd=
 	for bd in $blockdev ; do
 	    update_blockdev $bd