-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Looks good.
On Mon, 20 Jul 2009, Joel Granados Moreno wrote:
---
fsset.py | 28 +---------------------------
partedUtils.py | 6 ++----
partitions.py | 6 +++---
scripts/upd-instroot | 2 --
4 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/fsset.py b/fsset.py
index a7aebd2..771a482 100644
--- a/fsset.py
+++ b/fsset.py
@@ -716,8 +716,7 @@ class ext4FileSystem(extFileSystem):
if f in ext4FileSystem.specialFeatures:
if flags and "test_filesystem" in flags:
ext4 = fileSystemTypeGet("ext4")
- ext4dev = fileSystemTypeGet("ext4dev")
- if not ext4dev.isMountable() and ext4.isMountable():
+ if ext4.isMountable():
log.debug("%s probed as ext4" % (device,))
return True
else:
@@ -777,29 +776,6 @@ class ext4FileSystem(extFileSystem):
fileSystemTypeRegister(ext4FileSystem())
-class ext4devFileSystem(ext4FileSystem):
-
- # taken from e4fsprogs lib/blkid/probe.c
- def probe(device):
- flags, features = getExtFSFlagsFeatures(device)
- if flags and ('test_filesystem' in flags):
- ext4 = fileSystemTypeGet("ext4")
- ext4dev = fileSystemTypeGet("ext4dev")
- if ext4dev.isMountable() or not ext4.isMountable():
- log.debug("%s probed as ext4dev" % (device,))
- return True
- log.debug("%s not probed as ext4dev" % (device,))
- return False
- probe = staticmethod(probe)
-
- def __init__(self):
- ext4FileSystem.__init__(self)
- self.name = "ext4dev"
- # options are set in mke4fs.conf
- #self.extraFormatArgs = [ "-j", "-I", "256", "-E", "test_fs" ]
-
-fileSystemTypeRegister(ext4devFileSystem())
-
class raidMemberDummyFileSystem(FileSystemType):
def __init__(self):
FileSystemType.__init__(self)
@@ -3098,8 +3074,6 @@ def getFStoTry(device):
create = 0
else:
create = 1
- if ext4devFileSystem.probe(device):
- rc.append("ext4dev")
if ext4FileSystem.probe(device):
rc.append("ext4")
if isys.ext2HasJournal(device, makeDevNode = create):
diff --git a/partedUtils.py b/partedUtils.py
index 8aee9a1..f2bd909 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -502,9 +502,7 @@ def sniffFilesystemType(device):
# ext2 check
if struct.unpack("<H", buf[1080:1082]) == (0xef53,):
if isys.ext2HasJournal(dev, makeDevNode = 0):
- if fsset.ext4devFileSystem.probe(dev):
- return "ext4dev"
- elif fsset.ext4FileSystem.probe(dev):
+ if fsset.ext4FileSystem.probe(dev):
return "ext4"
else:
return "ext3"
@@ -884,7 +882,7 @@ class DiskSet:
if part.fs_type:
fstype = part.fs_type.name
- # parted doesn't tell ext4/ext4dev from ext3 for us
+ # parted doesn't tell ext4 from ext3 for us
if fstype == "ext3":
fstype = sniffFilesystemType("/dev/%s" % theDev)
diff --git a/partitions.py b/partitions.py
index f2292dc..e921716 100644
--- a/partitions.py
+++ b/partitions.py
@@ -266,7 +266,7 @@ class Partitions:
device = partedUtils.get_partition_name(part)
- # parted doesn't tell ext4/ext4dev from ext3 for us
+ # parted doesn't tell ext4 from ext3 for us
if ptype == fsset.fileSystemTypeGet("ext3"):
fsname = partedUtils.sniffFilesystemType("/dev/%s" % device)
try:
@@ -1228,9 +1228,9 @@ class Partitions:
errors.append("Bootable partitions cannot be on a GFS2 "
"filesystem.")
- # no ext4dev or ext4 support in grub
+ # no ext4 support in grub
if (bootreq and bootreq.fstype and
- bootreq.fstype.getName() in ["ext4", "ext4dev"]):
+ bootreq.fstype.getName() in ["ext4"]):
errors.append("Bootable partitions cannot be on an %s "
"filesystem." % bootreq.fstype.getName())
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index b3b76b6..7b19688 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -345,7 +345,6 @@ sbin/e4label
sbin/fsck.ext2
sbin/fsck.ext3
sbin/fsck.ext4
-sbin/fsck.ext4dev
sbin/fsck.jfs
sbin/fsck.xfs
sbin/fdisk
@@ -362,7 +361,6 @@ sbin/mke4fs
sbin/mkfs.ext2
sbin/mkfs.ext3
sbin/mkfs.ext4
-sbin/mkfs.ext4dev
sbin/mkfs.jfs
sbin/mkfs.xfs
sbin/mkfs.msdos
- --
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkpk2SgACgkQ5hsjjIy1Vkn3zgCffC4j3FapssI1ZztifnOnFRxx
ZaMAoI/abCuOJyJcPinIt6rb4bBxCjOd
=R7sQ
-----END PGP SIGNATURE-----
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
