os-prober/os-prober-usr_lib-detection.patch
Stephan Kulow 871faed8cd Accepting request 154934 from home:arvidjaar:branches:Base:System
- 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.

OBS-URL: https://build.opensuse.org/request/show/154934
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=19
2013-02-09 06:55:56 +00:00

23 lines
1.0 KiB
Diff

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")")"