--- pyanaconda/storage/formats/fs.py | 39 -------------------------------------- scripts/mk-images | 2 +- scripts/mk-images.alpha | 2 +- scripts/upd-instroot | 9 +------- 4 files changed, 3 insertions(+), 49 deletions(-) diff --git a/pyanaconda/storage/formats/fs.py b/pyanaconda/storage/formats/fs.py index c3ea79c..6f03b9c 100644 --- a/pyanaconda/storage/formats/fs.py +++ b/pyanaconda/storage/formats/fs.py @@ -1197,45 +1197,6 @@ class JFS(FS): register_device_format(JFS) -class ReiserFS(FS): - """ reiserfs filesystem """ - _type = "reiserfs" - _mkfs = "mkreiserfs" - _resizefs = "resize_reiserfs" - _labelfs = "reiserfstune" - _modules = ["reiserfs"] - _defaultFormatOptions = ["-f", "-f"] - _defaultLabelOptions = ["-l"] - _maxLabelChars = 16 - _maxSize = 16 * 1024 * 1024 - _formattable = True - _linuxNative = True - _supported = False - _dump = True - _check = True - _packages = ["reiserfs-utils"] - _infofs = "debugreiserfs" - _defaultInfoOptions = [] - _existingSizeFields = ["Count of blocks on the device:", "Blocksize:"] - partedSystem = fileSystemType["reiserfs"] - - @property - def supported(self): - """ Is this filesystem a supported type? """ - supported = self._supported - if flags.cmdline.has_key("reiserfs"): - supported = self.utilsAvailable - - return supported - - @property - def resizeArgs(self): - argv = ["-s", "%dM" % (self.targetSize,), self.device] - return argv - -register_device_format(ReiserFS) - - class XFS(FS): """ XFS filesystem """ _type = "xfs" diff --git a/scripts/mk-images b/scripts/mk-images index 1125c9b..e65ae69 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -102,7 +102,7 @@ FIREWIREMODS="ohci1394 sbp2 fw-ohci fw-sbp2 firewire-sbp2 firewire-ohci" SDMODS="mmc-block sdhci sdhci-pci" IDEMODS="ide-cd ide-cd_mod" SCSIMODS="sr_mod sg st sd_mod scsi_mod iscsi_tcp iscsi_ibft scsi_wait_scan" -FSMODS="fat msdos vfat ext2 ext3 ext4 reiserfs jfs xfs gfs2 cifs fuse btrfs hfsplus" +FSMODS="fat msdos vfat ext2 ext3 ext4 jfs xfs gfs2 cifs fuse btrfs hfsplus" LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-crypt" RAIDMODS="raid0 raid1 raid5 raid6 raid456 raid10 linear" CRYPTOMODS="sha256_generic cbc xts lrw aes_generic crypto_blkcipher crc32c ecb arc4" diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha index fb2ad60..9bc6992 100644 --- a/scripts/mk-images.alpha +++ b/scripts/mk-images.alpha @@ -19,7 +19,7 @@ INITRDMODS="tgafb crc32 $INITRDMODS" -###FSMODS="msdos vfat ext3 reiserfs jfs xfs" +###FSMODS="msdos vfat ext3 jfs xfs" ###IDEMODS="cdrom ide-cd" ###SCSIMODS="cdrom scsi_mod sd_mod sg sr_mod st" ###USBMODS="ohci-hcd uhci-hcd hid usb-storage sd_mod sr_mod" diff --git a/scripts/upd-instroot b/scripts/upd-instroot index f0d9f6e..98cdb54 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -192,7 +192,7 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda pygtk2-libglade pykickstart pyparted python python-bugzilla python-decorator python-libs python-nss python-pyblock python-sqlite python-epdb python-urlgrabber python-volume_key pyxf86config readline redhat-artwork - reiserfs-utils report-config-default report-gtk report-newt rpm rpm-libs + report-config-default report-gtk report-newt rpm rpm-libs rpm-python rsyslog sed selinux-policy-targeted setup slang smc-meera-fonts specspo sqlite startup-notification strace synaptics system-config-date @@ -420,7 +420,6 @@ sbin/clock sbin/consoletype sbin/cryptsetup sbin/debugfs -sbin/debugreiserfs sbin/dhclient sbin/dhclient-script sbin/dhcp6c @@ -434,7 +433,6 @@ sbin/fdisk sbin/fsck sbin/fsck.ext* sbin/fsck.jfs -sbin/fsck.reiserfs sbin/fsck.xfs sbin/hdparm sbin/hwclock @@ -459,12 +457,10 @@ sbin/mkfs.ext* sbin/mkfs.gfs2 sbin/mkfs.jfs sbin/mkfs.msdos -sbin/mkfs.reiserfs sbin/mkfs.vfat sbin/mkfs.xfs sbin/mkofboot sbin/mkraid -sbin/mkreiserfs sbin/mkswap sbin/mount.nfs* sbin/mount.ntfs* @@ -476,9 +472,6 @@ sbin/pcmcia-socket-startup sbin/pdisk sbin/probe sbin/pidof -sbin/reiserfsck -sbin/reiserfstune -sbin/resize_reiserfs sbin/resize2fs sbin/rmmod sbin/route -- 1.7.0.1 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list