|
|
2e96e6 |
From 723a35738d00b6ed46a9c298301e0dc6dfa78f2f Mon Sep 17 00:00:00 2001
|
|
|
2e96e6 |
From: Cyril Brulebois <kibi@debian.org>
|
|
|
2e96e6 |
Date: Thu, 8 Oct 2015 14:25:56 +0200
|
|
|
2e96e6 |
Subject: [PATCH 17/18] Add Windows 10 detection support (#1322956)
|
|
|
2e96e6 |
|
|
|
2e96e6 |
------------------------------------------------------------------------
|
|
|
2e96e6 |
Add support for Windows 10 (Closes: #801278).
|
|
|
2e96e6 |
|
|
|
2e96e6 |
It was previously reported as Windows Recovery Environment.
|
|
|
2e96e6 |
|
|
|
2e96e6 |
Thanks, Philipp Wolfer!
|
|
|
2e96e6 |
------------------------------------------------------------------------
|
|
|
2e96e6 |
(cherry picked from commit cb4370f2678de0b99171ffeac3cd67402271ce2e)
|
|
|
2e96e6 |
|
|
|
2e96e6 |
Resolves: rhbz#1322956
|
|
|
2e96e6 |
---
|
|
|
2e96e6 |
os-probes/mounted/x86/20microsoft | 4 +++-
|
|
|
2e96e6 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
2e96e6 |
|
|
|
2e96e6 |
diff --git a/os-probes/mounted/x86/20microsoft b/os-probes/mounted/x86/20microsoft
|
|
|
2e96e6 |
index ca255d8..668bb4e 100755
|
|
|
2e96e6 |
--- a/os-probes/mounted/x86/20microsoft
|
|
|
2e96e6 |
+++ b/os-probes/mounted/x86/20microsoft
|
|
|
2e96e6 |
@@ -31,7 +31,9 @@ if item_in_dir -q bootmgr "$2"; then
|
|
|
2e96e6 |
for boot in $(item_in_dir boot "$2"); do
|
|
|
2e96e6 |
bcd=$(item_in_dir bcd "$2/$boot")
|
|
|
2e96e6 |
if [ -n "$bcd" ]; then
|
|
|
2e96e6 |
- if grep -aqs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then
|
|
|
2e96e6 |
+ if grep -aqs "W.i.n.d.o.w.s. .1.0" "$2/$boot/$bcd"; then
|
|
|
2e96e6 |
+ long="Windows 10 (loader)"
|
|
|
2e96e6 |
+ elif grep -aqs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then
|
|
|
2e96e6 |
long="Windows 8 (loader)"
|
|
|
2e96e6 |
elif grep -aqs "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then
|
|
|
2e96e6 |
long="Windows 7 (loader)"
|
|
|
2e96e6 |
--
|
|
|
2e96e6 |
2.5.5
|
|
|
2e96e6 |
|