rpm/os-prober
SHA256
1
0
Fork 0
forked from pool/os-prober
Code Pull Requests Activity

Accepting request 160859 from Base:System

Browse Source 
resubmit with patch mentioned in changes. (forwarded request 160858 from arvidjaar)

OBS-URL: https://build.opensuse.org/request/show/160859
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/os-prober?expand=0&rev=14
This commit is contained in:
Stephan Kulow 2013-03-25 19:40:26 +00:00 committed by Git OBS Bridge
commit 9064fcc7a4
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
os-prober-probe-MD-devices.patch Normal file
View File

@ -0,0 +1,26 @@
Index: os-prober/os-prober
===================================================================
--- os-prober.orig/os-prober
+++ os-prober/os-prober
@@ -39,6 +39,11 @@ partitions () {
fi
done
+ # Add Linux MD unpartioned devices. Linux MD partitions are already covered above
+ [ -f /proc/mdstat ] && grep '^md' /proc/mdstat | while read md line; do
+ [ -e "/dev/$md" ] && echo "/dev/$md"
+ done
+
# Add Serial ATA RAID devices
if type dmraid >/dev/null 2>&1 && \
dmraid -s -c >/dev/null 2>&1; then
@@ -79,7 +84,8 @@ parse_proc_mdstat () {
udevadm info "$@"
}
fi
- while read line; do
+ # Only add MD slaves to the list
+ while read md line; do
for word in $line; do
dev="${word%%[*}"
# TODO: factor this out to something in di-utils if

6
os-prober.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 22 17:29:32 UTC 2013 - arvidjaar@gmail.com
- add os-prober-probe-MD-devices.patch (bnc#811006)
* probe also Linux MD devices
-------------------------------------------------------------------
Sun Mar 3 16:06:32 UTC 2013 - arvidjaar@gmail.com

3
os-prober.spec
View File

@ -44,6 +44,8 @@ Patch4: os-prober-1.49-skip-LVM2_member.patch
Patch5: os-prober-1.49-grub2-mount.patch
# PATCH-FIX-OPENSUSE: Detect distributions which moved /lib to /usr/lib
Patch6: os-prober-usr_lib-detection.patch
# PATCH-FIX-OPENSUSE: Probe also unpartitioned Linux MD devices (bnc#811006)
Patch7: os-prober-probe-MD-devices.patch
Requires: /bin/grep
Requires: /bin/sed
@ -69,6 +71,7 @@ cp %SOURCE1 .
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}"