diff --git a/os-prober-usrmovefix.patch b/os-prober-usrmovefix.patch new file mode 100644 index 0000000..361a9e3 --- /dev/null +++ b/os-prober-usrmovefix.patch @@ -0,0 +1,13 @@ +diff -up os-prober-1.53/os-probes/mounted/common/90linux-distro.usermovefix os-prober-1.53/os-probes/mounted/common/90linux-distro +--- os-prober-1.53/os-probes/mounted/common/90linux-distro.usermovefix 2012-06-02 20:07:39.878619263 +0430 ++++ os-prober-1.53/os-probes/mounted/common/90linux-distro 2012-06-02 20:14:40.341362757 +0430 +@@ -13,7 +13,8 @@ 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* >/dev/null 2>/dev/null && [ -d "$dir/boot" ] \ ++ || 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")")" diff --git a/os-prober.spec b/os-prober.spec index a1c2fb2..df377be 100644 --- a/os-prober.spec +++ b/os-prober.spec @@ -1,6 +1,6 @@ Name: os-prober Version: 1.53 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Probes disks on the system for installed operating systems Group: System Environment/Base @@ -16,6 +16,7 @@ Patch1: os-porber-no-dummy-mach-kernel.patch Patch2: os-prober-mdraidfix.patch Patch3: os-prober-grub2-fedorafix.patch Patch4: os-prober-yaboot-parsefix.patch +Patch5: os-prober-usrmovefix.patch Requires: udev coreutils util-linux Requires: grep /bin/sed /sbin/modprobe @@ -32,6 +33,7 @@ distributions can be added easily. %patch2 -p1 -b .mdraidfix %patch3 -p1 %patch4 -p1 -b .yaboot-parsefix +%patch5 -p1 find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \; sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \ @@ -82,6 +84,10 @@ fi %{_var}/lib/%{name} %changelog +* Sat Jun 02 2012 Hedayat Vatankhah - 1.53-3 +- Consider usrmoved distribtions in fallback linux detector (bug #826754) +- Remove patch backup files from final rpm package (by not creating a backup!) + * Fri May 25 2012 Hedayat Vatankhah - 1.53-2 - Add support for OSes installed on Linux mdraid partitions, bug #752402 - Add Fedora's grub2 config path, fixes generating menu entries for other