From 0ecbb561992d9b1fa4b11f0c264cfa615d756bff Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 24 Jun 2005 07:53:10 +0000
Subject: normalize mke2fs and mkreiserfs into mkfs.<fs_type>

---
 perl-install/fs/format.pm   | 12 ++++++------
 perl-install/share/list.xml |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 5eb0683dc..3238df33c 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -10,9 +10,9 @@ use fs::loopback;
 use log;
 
 my %cmds = (
-    ext2     => [ 'e2fsprogs', 'mke2fs', '-F' ],
-    ext3     => [ 'e2fsprogs', 'mke2fs', '-F', '-j' ],
-    reiserfs => [ 'reiserfsprogs', 'mkreiserfs', '-ff' ],
+    ext2     => [ 'e2fsprogs', 'mkfs.ext2', '-F' ],
+    ext3     => [ 'e2fsprogs', 'mkfs.ext2', '-F', '-j' ],
+    reiserfs => [ 'reiserfsprogs', 'mkfs.reiserfs', '-ff' ],
     xfs      => [ 'xfsprogs', 'mkfs.xfs', '-f', '-q' ],
     jfs      => [ 'jfsprogs', 'mkfs.jfs', '-f' ],
     hfs      => [ 'hfsutils', 'hformat' ],
@@ -115,8 +115,8 @@ sub part_raw {
 
     my @args = ($cmd, @first_options, @options, devices::make($dev));
 
-    if ($cmd eq 'mke2fs' && $wait_message) {
-	mke2fs($wait_message, @args) or die N("%s formatting of %s failed", $fs_type, $dev);
+    if ($cmd eq 'mkfs.ext2' && $wait_message) {
+	mkfs_ext2($wait_message, @args) or die N("%s formatting of %s failed", $fs_type, $dev);
     } else {
 	run_program::raw({ timeout => 60 * 60 }, @args) or die N("%s formatting of %s failed", $fs_type, $dev);
     }
@@ -128,7 +128,7 @@ sub part_raw {
     set_isFormatted($part, 1);
 }
 
-sub mke2fs {
+sub mkfs_ext2 {
     my ($wait_message, @args) = @_;
 
     open(my $F, "@args |");
diff --git a/perl-install/share/list.xml b/perl-install/share/list.xml
index d3becc9e1..841c6182f 100644
--- a/perl-install/share/list.xml
+++ b/perl-install/share/list.xml
@@ -17,9 +17,9 @@
 
   badblocks
   mkswap
-  mke2fs e2fsck tune2fs dumpe2fs resize2fs
+  mkfs.ext2 e2fsck tune2fs dumpe2fs resize2fs
 
-  mkreiserfs
+  mkfs.reiserfs
   mkfs.xfs
   resize_reiserfs
   <if ARCH="i.86|x86_64|ia64">
-- 
cgit v1.2.1