diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-04-30 10:37:53 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-04-30 10:37:53 +0000 |
| commit | c25364cf4dcf6b6c7aa149d1f83c8212b70fb3d7 (patch) | |
| tree | 0b57313c5a64bca622dcf7c166902eeee4845aec /perl-install/fs | |
| parent | f4c7967581075bdddd67127b1aa339d88cbc35a4 (diff) | |
| download | drakx-backup-do-not-use-c25364cf4dcf6b6c7aa149d1f83c8212b70fb3d7.tar drakx-backup-do-not-use-c25364cf4dcf6b6c7aa149d1f83c8212b70fb3d7.tar.gz drakx-backup-do-not-use-c25364cf4dcf6b6c7aa149d1f83c8212b70fb3d7.tar.bz2 drakx-backup-do-not-use-c25364cf4dcf6b6c7aa149d1f83c8212b70fb3d7.tar.xz drakx-backup-do-not-use-c25364cf4dcf6b6c7aa149d1f83c8212b70fb3d7.zip | |
drop support for reiser4 (mga#5680)
Diffstat (limited to 'perl-install/fs')
| -rw-r--r-- | perl-install/fs/format.pm | 3 | ||||
| -rw-r--r-- | perl-install/fs/type.pm | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm index 6e4568da7..c511cf51d 100644 --- a/perl-install/fs/format.pm +++ b/perl-install/fs/format.pm @@ -15,7 +15,6 @@ my %cmds = ( ext3 => [ 'e2fsprogs', 'mkfs.ext3', '-F' ], ext4 => [ 'e2fsprogs', 'mkfs.ext4', '-F' ], reiserfs => [ 'reiserfsprogs', 'mkfs.reiserfs', '-ff' ], - reiser4 => [ 'reiser4progs', 'mkfs.reiser4', '-f', '-y' ], xfs => [ 'xfsprogs', 'mkfs.xfs', '-f', '-q' ], jfs => [ 'jfsutils', 'mkfs.jfs', '-f' ], hfs => [ 'hfsutils', 'hformat' ], @@ -33,7 +32,6 @@ my %LABELs = ( #- option, length, handled_by_mount ext3 => [ '-L', 16, 1 ], ext4 => [ '-L', 16, 1 ], reiserfs => [ '-l', 16, 1 ], - reiser4 => [ '-L', 16, 1 ], xfs => [ '-L', 12, 1 ], jfs => [ '-L', 16, 1 ], hfs => [ '-l', 27, 0 ], @@ -53,7 +51,6 @@ my %edit_LABEL = ( # package, command, option ext3 => [ 'e2fsprogs', 'tune2fs', '-L' ], ext4 => [ 'e2fsprogs', 'tune2fs', '-L' ], reiserfs => [ 'reiserfsprogs', 'reiserfstune', '-l' ], -# reiser4 xfs => [ 'xfsprogs', 'xfs_admin', '-L' ], jfs => [ 'jfsutils', 'jfs_tune', '-L' ], # hfs diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index 18c4f56dd..6318e6804 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -119,9 +119,6 @@ if_(arch() !~ /ppc/, 0x75 => '', 'PC/IX', 0x80 => '', 'Old Minix', 0x81 => '', 'Minix / old Linux', - if_(!$::isInstall, - 0x83 => 'reiser4', 'Journalised FS: Reiser4', - ), 0x83 => 'nilfs2', 'NILFS2', 0x83 => 'btrfs', 'Btrfs', 0x84 => '', 'OS/2 hidden C: drive', @@ -312,7 +309,7 @@ sub type_subpart_from_magic { sub defaultFS() { 'ext4' } -sub true_local_fs_types() { qw(btrfs ext3 ext2 ext4 reiserfs reiser4 xfs jfs) } +sub true_local_fs_types() { qw(btrfs ext3 ext2 ext4 reiserfs xfs jfs) } sub isEmpty { !$_[0]{fs_type} && $_[0]{pt_type} == 0 } sub isEfi { arch() =~ /ia64/ && $_[0]{pt_type} == 0xef } |