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

Accepting request 154968 from Base:System

Browse Source 
- os-prober-usr_lib-detection.patch - fix detection of linux distro
  which moved /lib to /usr/lib (e.g. Fedora)


This fixes regression after grub2-mount started to be used. I think
it should go in before final, at least Fedora 18 is missed without
this patch. For post 12.3 I have prepared update to the current upstream
which includes this fix. (forwarded request 154934 from arvidjaar)

OBS-URL: https://build.opensuse.org/request/show/154968
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/os-prober?expand=0&rev=12
This commit is contained in:
Stephan Kulow 2013-02-10 14:20:28 +00:00 committed by Git OBS Bridge
commit eb13e13732
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
os-prober-usr_lib-detection.patch Normal file
View File

@ -0,0 +1,22 @@
From: Andrey Borzenkov <arvidjaar@gmail.com>
Subject: fix detection of distributions with /lib => /usr/lib symlink
Upstream: yes
grub-mount does not implement symbolic links, so distributions
that replaced /lib with /usr/lib were not detected. Check both
/lib and /usr/lib. Patch taken from upstream version.
Affected is e.g. Fedora 18.
Index: os-prober/os-probes/mounted/common/90linux-distro
===================================================================
--- os-prober.orig/os-probes/mounted/common/90linux-distro
+++ os-prober/os-probes/mounted/common/90linux-distro
@@ -13,7 +13,7 @@ type="$3"
# better. Make sure this test has a high number so that more accurate tests
# can come first.
# TODO: look for ld-linux.so on arches that have it
-if ls "$dir"/lib*/ld*.so* >/dev/null 2>/dev/null; then
+if (ls "$dir"/lib*/ld*.so* || ls "$dir"/usr/lib*/ld*.so*) >/dev/null 2>/dev/null; then
if [ -e "$dir/etc/debian_version" ]; then
short="Debian"
long="$(printf "Debian GNU/Linux (%s)\n" "$(cat "$dir/etc/debian_version")")"

6
os-prober.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 8 15:16:13 UTC 2013 - arvidjaar@gmail.com
- os-prober-usr_lib-detection.patch - fix detection of linux distro
which moved /lib to /usr/lib (e.g. Fedora)
-------------------------------------------------------------------
Sat Jan 19 19:12:20 UTC 2013 - arvidjaar@gmail.com

3
os-prober.spec
View File

@ -42,6 +42,8 @@ Patch3: os-prober-1.49-fix-grub2.cfg-parsing.patch
Patch4: os-prober-1.49-skip-LVM2_member.patch
# PATCH-FIX-OPENSUSE: Use correct name for grub2-mount
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
Requires: /bin/grep
Requires: /bin/sed
@ -66,6 +68,7 @@ cp %SOURCE1 .
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}"