Hello community,
here is the log from the commit of package os-prober for openSUSE:Factory
checked in at 2013-02-10 15:20:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
and /work/SRC/openSUSE:Factory/.os-prober.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2013-01-29
07:01:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-02-10
15:20:30.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 8 15:16:13 UTC 2013 - arvidj...@gmail.com
+
+- os-prober-usr_lib-detection.patch - fix detection of linux distro
+ which moved /lib to /usr/lib (e.g. Fedora)
+
+-------------------------------------------------------------------
New:
----
os-prober-usr_lib-detection.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-prober.spec ++++++
--- /var/tmp/diff_new_pack.9yOPsC/_old 2013-02-10 15:20:32.000000000 +0100
+++ /var/tmp/diff_new_pack.9yOPsC/_new 2013-02-10 15:20:32.000000000 +0100
@@ -42,6 +42,8 @@
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 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}"
++++++ os-prober-usr_lib-detection.patch ++++++
From: Andrey Borzenkov <arvidj...@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")")"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
