From 50d23499e66ddce5b9bf2b39d1ce642497139715 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 4 Jun 2011 10:47:35 -0700
Subject: [PATCH] Small correction of fdisk output format

---
 fdisk/fdisk-lib.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdisk/fdisk-lib.pl b/fdisk/fdisk-lib.pl
index 77e0a68a6..05f822423 100755
--- a/fdisk/fdisk-lib.pl
+++ b/fdisk/fdisk-lib.pl
@@ -613,7 +613,7 @@ else {
 	# Using fdisk
 	&open_fdisk($disk);
 	&wprint("n\n");
-	local $wf = &wait_for($fh, 'primary.*\r\n', 'First.*:');
+	local $wf = &wait_for($fh, 'primary.*\r?\n', 'First.*:');
 	if ($part > 4) {
 		&wprint("l\n");
 		}
@@ -660,7 +660,7 @@ else {
 	# Use classic fdisk
 	&open_fdisk($disk);
 	&wprint("n\n");
-	&wait_for($fh, 'primary.*\r\n');
+	&wait_for($fh, 'primary.*\r?\n');
 	&wprint("e\n");
 	&wait_for($fh, 'Partition.*:');
 	&wprint("$part\n");