Hello community,
here is the log from the commit of package os-prober for openSUSE:Factory
checked in at 2014-06-26 08:00:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
and /work/SRC/openSUSE:Factory/.os-prober.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober"
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2014-06-19
13:08:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2014-06-26
08:00:33.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 20 20:42:01 UTC 2014 - je...@suse.com
+
+- add os-prober-call-dmraid-once.patch
+ * fix os-prober: dmraid is called without a device list for every
+ partition (bnc#883453)
+
+-------------------------------------------------------------------
New:
----
os-prober-call-dmraid-once.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-prober.spec ++++++
--- /var/tmp/diff_new_pack.XlqsN5/_old 2014-06-26 08:00:34.000000000 +0200
+++ /var/tmp/diff_new_pack.XlqsN5/_new 2014-06-26 08:00:34.000000000 +0200
@@ -53,6 +53,8 @@
Patch13: os-prober-fix-btrfs-subvol-mounted-tests.patch
# PATCH-FIX-SLE: fix os-prober creates many unusuable entries on multipath
disk (bnc#875327)
Patch14: os-prober-skip-part-on-multipath.patch
+# PATCH-FIX-SLE: fix os-prober: dmraid is called without a device list for
every partition (bnc#883453)
+Patch15: os-prober-call-dmraid-once.patch
Requires: /bin/grep
Requires: /bin/sed
@@ -85,6 +87,7 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
%build
make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}"
++++++ os-prober-call-dmraid-once.patch ++++++
From: Jeff Mahoney <je...@suse.com>
Subject: os-prober: call dmraid -r *once*
References: bnc#883453
os-prober calls dmraid -r -c unqualifed for every partition and then greps
the result. dmraid -r -c without a device list will scan every device
on the system. Every time. The results will not differ between runs.
This patch saves the results and performs the grep afterward.
Signed-off-by: Jeff Mahoney <je...@suse.com>
---
os-prober | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- a/os-prober
+++ b/os-prober
@@ -14,11 +14,17 @@ log_output () {
fi
}
+: >"$OS_PROBER_TMP/dmraid-map"
+DMRAID=$(type dmraid >/dev/null 2>&1 || true)
+if [ -n "$DMRAID" ]; then
+ dmraid -r -c >"$OS_PROBER_TMP/dmraid-map"
+fi
+
on_sataraid () {
type dmraid >/dev/null 2>&1 || return 1
local parent="${1%/*}"
local device="/dev/${parent##*/}"
- if dmraid -r -c | grep -q "$device"; then
+ if grep -q "$device" "$OS_PROBER_TMP/dmraid-map"; then
return 0
fi
return 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
