diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-09-20 03:31:26 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-09-20 03:31:26 +0000 |
| commit | 31f1add4879da48efb7af21fc5c575692cc3709d (patch) | |
| tree | 7a541b8f54f91ed8309da17752e205b40db2cf30 /partedUtils.py | |
| parent | 8307d33391423f13c1deed409b80d8e381582a93 (diff) | |
| download | anaconda-31f1add4879da48efb7af21fc5c575692cc3709d.tar.gz anaconda-31f1add4879da48efb7af21fc5c575692cc3709d.tar.xz anaconda-31f1add4879da48efb7af21fc5c575692cc3709d.zip | |
merge from taroon
fairly large merge, but all fairly obvious stuff. will test in a tree tomorrow
Diffstat (limited to 'partedUtils.py')
| -rw-r--r-- | partedUtils.py | 4 |
1 files changed, 2 insertions, 2 deletions
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: |