Blame SOURCES/0021-Fix-extended-dos-partition-regex-1322957.patch

e8c52d
From 8f35f6d6f82a69dc569574ba644c635b09254065 Mon Sep 17 00:00:00 2001
e8c52d
From: Robert Marshall <rmarshall@redhat.com>
e8c52d
Date: Wed, 14 Sep 2016 14:35:09 -0400
e8c52d
Subject: [PATCH] Fix extended dos partition regex (#1322957)
e8c52d
e8c52d
The regular expression detecting instances of extended dos partitions
e8c52d
did not capture all cases. Modified the expression to correctly capture
e8c52d
the case where the target phrase is followed by a newline.
e8c52d
e8c52d
Resolves: rhbz#1322957
e8c52d
---
e8c52d
 common.sh | 2 +-
e8c52d
 1 file changed, 1 insertion(+), 1 deletion(-)
e8c52d
e8c52d
diff --git a/common.sh b/common.sh
e8c52d
index 4cd300d..b460d7a 100644
e8c52d
--- a/common.sh
e8c52d
+++ b/common.sh
e8c52d
@@ -138,7 +138,7 @@ is_dos_extended_partition() {
e8c52d
 		fi
e8c52d
 
e8c52d
 		# dos partition type and no filesystem type?...
e8c52d
-		if echo $output | grep -q ' PTTYPE=dos ' &&
e8c52d
+		if echo $output | grep -q ' PTTYPE=dos\( \|$\)' &&
e8c52d
 				! echo $output | grep -q ' TYPE='; then
e8c52d
 			return 0
e8c52d
 		else
e8c52d
-- 
e8c52d
2.7.4
e8c52d