From 31f1add4879da48efb7af21fc5c575692cc3709d Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@redhat.com>
Date: Sat, 20 Sep 2003 03:31:26 +0000
Subject: merge from taroon

fairly large merge, but all fairly obvious stuff.  will test in a tree tomorrow
---
 partedUtils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'partedUtils.py')

diff --git a/partedUtils.py b/partedUtils.py
index 71a724bb2..12ef0eb03 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -241,7 +241,7 @@ def getDefaultDiskType():
         return parted.disk_type_get("msdos")
 
 archLabels = {'i386': ['msdos'],
-              's390': ['dasd'],
+              's390': ['dasd', 'msdos'],
               'alpha': ['bsd', 'msdos'],
               'sparc': ['sun'],
               'ia64': ['msdos', 'gpt'],
@@ -394,7 +394,7 @@ def sniffFilesystemType(device):
 	return None
 
     # ext2 check
-    if struct.unpack("H", buf[1080:1082]) == (0xef53,):
+    if struct.unpack("<H", buf[1080:1082]) == (0xef53,):
         if isys.ext2HasJournal(dev, makeDevNode = 0):
             return "ext3"
         else:
-- 
cgit