Hello community,
here is the log from the commit of package os-prober for openSUSE:Factory
checked in at 2015-10-12 10:00:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
and /work/SRC/openSUSE:Factory/.os-prober.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober"
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2015-08-07
00:17:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-10-12
10:00:01.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Oct 1 07:24:12 UTC 2015 - mch...@suse.com
+
+- replace os-prober-grep-for-windows-bcd-file.patch by upstream's version
+ * modified os-prober-grep-for-windows-bcd-file.patch
+- include patch from upstream to fix os-prober is missing support for
+ Windows 10 (bsc#947487)
+ * added os-prober-properly-detect-Windows-10.patch
+
+-------------------------------------------------------------------
New:
----
os-prober-properly-detect-Windows-10.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-prober.spec ++++++
--- /var/tmp/diff_new_pack.YtN9rr/_old 2015-10-12 10:00:02.000000000 +0200
+++ /var/tmp/diff_new_pack.YtN9rr/_new 2015-10-12 10:00:02.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package os-prober
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -54,7 +54,7 @@
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-OPENSUSE: fix os-prober misinterprets Windows 8 to be Vista
(bsc#910654)
+# 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
@@ -62,6 +62,8 @@
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
Requires: /bin/grep
Requires: /bin/sed
Requires: /sbin/modprobe
@@ -102,6 +104,7 @@
%patch17 -p1
%patch18 -p1
%patch19 -p1
+%patch20 -p1
find . -name \*.orig -delete
%build
++++++ os-prober-grep-for-windows-bcd-file.patch ++++++
--- /var/tmp/diff_new_pack.YtN9rr/_old 2015-10-12 10:00:02.000000000 +0200
+++ /var/tmp/diff_new_pack.YtN9rr/_new 2015-10-12 10:00:02.000000000 +0200
@@ -1,31 +1,64 @@
-Index: os-prober/os-probes/mounted/x86/20microsoft
-===================================================================
---- os-prober.orig/os-probes/mounted/x86/20microsoft
-+++ os-prober/os-probes/mounted/x86/20microsoft
+From 15dec5c28b77b6db1492e42e25946cd7ae7a7885 Mon Sep 17 00:00:00 2001
+From: Cyril Brulebois <k...@debian.org>
+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 <k...@debian.org> 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 -qs --text "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 -qs --text "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 -qs --text "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 -qs --text "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 -qs --text "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 -qs --text "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 -qs --text "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
+
++++++ os-prober-properly-detect-Windows-10.patch ++++++
>From 1643858767dda87140201d7ff0e0f3857b8bbf25 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapie...@canonical.com>
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 <mathieu...@gmail.com> 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
