diff --git a/os-prober-grep-for-windows-bcd-file.patch b/os-prober-grep-for-windows-bcd-file.patch deleted file mode 100644 index dd01b05..0000000 --- a/os-prober-grep-for-windows-bcd-file.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 15dec5c28b77b6db1492e42e25946cd7ae7a7885 Mon Sep 17 00:00:00 2001 -From: Cyril Brulebois -Date: Fri, 10 Jul 2015 00:59:38 +0200 -Subject: [PATCH] Add -a flag to grep -qs for Windows Vista detection (Closes: - #791383). - -It appears the file isn't always considered as a text file, so this should be -more robust. Thanks to Gianluigi Tiesi for the report and the suggestion. ---- - debian/changelog | 9 +++++++++ - os-probes/mounted/x86/20microsoft | 14 +++++++------- - 2 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/debian/changelog b/debian/changelog -index 195a3f2..1643099 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,3 +1,12 @@ -+os-prober (1.66) UNRELEASED; urgency=medium -+ -+ * Add -a flag to grep -qs for Windows Vista detection. It appears the -+ file isn't always considered as a text file, so this should be more -+ robust. Thanks to Gianluigi Tiesi for the report and the suggestion -+ (Closes: #791383). -+ -+ -- Cyril Brulebois Fri, 10 Jul 2015 00:56:21 +0200 -+ - os-prober (1.65) unstable; urgency=medium - - [ Steve McIntyre ] -diff --git a/os-probes/mounted/x86/20microsoft b/os-probes/mounted/x86/20microsoft -index 6fb3cc5..af83f40 100755 ---- a/os-probes/mounted/x86/20microsoft -+++ b/os-probes/mounted/x86/20microsoft -@@ -31,19 +31,19 @@ if item_in_dir -q bootmgr "$2"; then - for boot in $(item_in_dir boot "$2"); do - bcd=$(item_in_dir bcd "$2/$boot") - if [ -n "$bcd" ]; then -- if grep -qs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then -+ if grep -aqs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then - long="Windows 8 (loader)" -- elif grep -qs "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then -+ elif grep -aqs "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then - long="Windows 7 (loader)" -- elif grep -qs "W.i.n.d.o.w.s. .V.i.s.t.a" "$2/$boot/$bcd"; then -+ elif grep -aqs "W.i.n.d.o.w.s. .V.i.s.t.a" "$2/$boot/$bcd"; then - long="Windows Vista (loader)" -- elif grep -qs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8. .R.2." "$2/$boot/$bcd"; then -+ elif grep -aqs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8. .R.2." "$2/$boot/$bcd"; then - long="Windows Server 2008 R2 (loader)" -- elif grep -qs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8." "$2/$boot/$bcd"; then -+ elif grep -aqs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8." "$2/$boot/$bcd"; then - long="Windows Server 2008 (loader)" -- elif grep -qs "W.i.n.d.o.w.s. .R.e.c.o.v.e.r.y. .E.n.v.i.r.o.n.m.e.n.t" "$2/$boot/$bcd"; then -+ elif grep -aqs "W.i.n.d.o.w.s. .R.e.c.o.v.e.r.y. .E.n.v.i.r.o.n.m.e.n.t" "$2/$boot/$bcd"; then - long="Windows Recovery Environment (loader)" -- elif grep -qs "W.i.n.d.o.w.s. .S.e.t.u.p" "$2/$boot/$bcd"; then -+ elif grep -aqs "W.i.n.d.o.w.s. .S.e.t.u.p" "$2/$boot/$bcd"; then - long="Windows Recovery Environment (loader)" - else - long="Windows Vista (loader)" --- -1.8.5.2 - diff --git a/os-prober-properly-detect-Windows-10.patch b/os-prober-properly-detect-Windows-10.patch deleted file mode 100644 index 4e83c34..0000000 --- a/os-prober-properly-detect-Windows-10.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1643858767dda87140201d7ff0e0f3857b8bbf25 Mon Sep 17 00:00:00 2001 -From: Mathieu Trudel-Lapierre -Date: Mon, 21 Sep 2015 10:36:00 -0400 -Subject: [PATCH] os-probes/mounted/x86/20microsoft: properly detect Windows 10 - installs. Thanks to David Martin for the patch. - ---- - debian/changelog | 7 +++++++ - os-probes/mounted/x86/20microsoft | 4 +++- - 2 files changed, 10 insertions(+), 1 deletion(-) - -Index: os-prober/os-probes/mounted/x86/20microsoft -=================================================================== ---- os-prober.orig/os-probes/mounted/x86/20microsoft 2015-10-01 17:04:58.708069823 +0800 -+++ os-prober/os-probes/mounted/x86/20microsoft 2015-10-01 17:05:59.072069823 +0800 -@@ -31,7 +31,9 @@ - for boot in $(item_in_dir boot "$2"); do - bcd=$(item_in_dir bcd "$2/$boot") - if [ -n "$bcd" ]; then -- if grep -aqs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then -+ if grep -aqs "W.i.n.d.o.w.s. .1.0" "$2/$boot/$bcd"; then -+ long="Windows 10 (loader)" -+ elif grep -aqs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then - long="Windows 8 (loader)" - elif grep -aqs "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then - long="Windows 7 (loader)" -Index: os-prober/debian/changelog -=================================================================== ---- os-prober.orig/debian/changelog 2015-10-01 17:04:58.708069823 +0800 -+++ os-prober/debian/changelog 2015-10-01 17:04:58.752069823 +0800 -@@ -1,3 +1,10 @@ -+os-prober (1.67) UNRELEASED; urgency=medium -+ -+ * os-probes/mounted/x86/20microsoft: properly detect Windows 10 installs. -+ Thanks to David Martin for the patch. -+ -+ -- Mathieu Trudel-Lapierre Mon, 21 Sep 2015 10:34:29 -0400 -+ - os-prober (1.66) UNRELEASED; urgency=medium - - * Add -a flag to grep -qs for Windows Vista detection. It appears the diff --git a/os-prober-skip-part-on-multipath.patch b/os-prober-skip-part-on-multipath.patch index 122df4e..4b812a4 100644 --- a/os-prober-skip-part-on-multipath.patch +++ b/os-prober-skip-part-on-multipath.patch @@ -2,10 +2,10 @@ Index: os-prober-1.61/os-prober =================================================================== --- os-prober-1.61.orig/os-prober +++ os-prober-1.61/os-prober -@@ -24,6 +24,29 @@ on_sataraid () { +@@ -23,6 +23,28 @@ + fi return 1 } - +mp_disks="UNDEF" +on_multipath () { + type multipath >/dev/null 2>&1 || return 1 @@ -28,10 +28,9 @@ Index: os-prober-1.61/os-prober + done + return 1 +} -+ + partitions () { - # Exclude partitions that have whole_disk sysfs attribute set. - if [ -d /sys/block ]; then + os_name="$(uname -s)" @@ -31,7 +54,7 @@ partitions () { # Serial ATA RAID disk. for part in /sys/block/*/*[0-9]; do diff --git a/os-prober.changes b/os-prober.changes index b94a9af..854ba89 100644 --- a/os-prober.changes +++ b/os-prober.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Nov 10 00:32:40 UTC 2015 - p.drouand@gmail.com + +- Update to version 1.70 + * Fix hurd-any support: Test for /servers instead of /servers/exec + to avoid starting an translator in the mounted system. Also, + /hurd/init might be phased out at some point (Closes: #802053). +- Remove patches; fixed on upstream release + * os-prober-grep-for-windows-bcd-file.patch + * os-prober-properly-detect-Windows-10.patch + ------------------------------------------------------------------- Mon Nov 9 10:32:31 UTC 2015 - lnussel@suse.de diff --git a/os-prober.spec b/os-prober.spec index 782398a..5c60d8b 100644 --- a/os-prober.spec +++ b/os-prober.spec @@ -17,7 +17,7 @@ Name: os-prober -Version: 1.65 +Version: 1.70 Release: 0 Summary: Probes disks on the system for installed operating systems License: GPL-2.0+ @@ -54,16 +54,12 @@ Patch13: os-prober-fix-btrfs-subvol-mounted-tests.patch Patch14: os-prober-skip-part-on-multipath.patch # PATCH-FIX-SLE: fix os-prober: dmraid is called without a device list for every partition (bnc#883453) Patch15: os-prober-call-dmraid-once.patch -# PATCH-FIX-UPSTREAM: fix os-prober misinterprets Windows 8 to be Vista (bsc#910654) -Patch16: os-prober-grep-for-windows-bcd-file.patch # PATCH-FIX-SLE: fix os-prober fails to detect other SLES12 installation (bsc#892364) Patch17: Improve-btrfs-handling-on-os-probing-for-grub2.patch # PATCH-FIX-SLE: fix os-prober mount error, no such file or directory (bsc#931955) Patch18: os-prober-btrfs-absolute-subvol.patch # PATCH-FIX-OPENSUSE: also skip legacy grub if /boot/grub2/grub.cfg is present Patch19: os-prober-40grub-check-grub2.patch -# PATCH-FIX-UPSTREAM: fix os-prober is missing support for Windows 10 detection (bsc#947487) -Patch20: os-prober-properly-detect-Windows-10.patch # PATCH-FIX-OPENSUSE: detect os on default subvolume in snapshot (bsc#954225) Patch21: os-prober-btrfs-snapshot-detection.patch Requires: /bin/grep @@ -86,7 +82,7 @@ in a generic machine-readable format. Support for new OSes and Linux distributions can be added easily. %prep -%setup -q -n %{name} +%setup -q cp %{SOURCE1} . %patch0 -p1 %patch1 -p1 @@ -102,11 +98,9 @@ cp %{SOURCE1} . %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 %patch21 -p1 find . -name \*.orig -delete diff --git a/os-prober_1.65.tar.xz b/os-prober_1.65.tar.xz deleted file mode 100644 index 22fafe3..0000000 --- a/os-prober_1.65.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 -size 24712 diff --git a/os-prober_1.70.tar.xz b/os-prober_1.70.tar.xz new file mode 100644 index 0000000..741a4df --- /dev/null +++ b/os-prober_1.70.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d +size 25468