summaryrefslogtreecommitdiffstats
path: root/perl-install/fs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-23 16:40:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-23 16:40:08 +0000
commit773528df8b600f7d3c2dd22f16bae7b9b316141f (patch)
tree293b309f3ed737313216c0a5c3ac9c7e9241f8f5 /perl-install/fs.pm
parentd9757f22f0e0c2b10904b75b5b5d2c8d6fefa977 (diff)
downloaddrakx-773528df8b600f7d3c2dd22f16bae7b9b316141f.tar
drakx-773528df8b600f7d3c2dd22f16bae7b9b316141f.tar.gz
drakx-773528df8b600f7d3c2dd22f16bae7b9b316141f.tar.bz2
drakx-773528df8b600f7d3c2dd22f16bae7b9b316141f.tar.xz
drakx-773528df8b600f7d3c2dd22f16bae7b9b316141f.zip
nicer error message when mount fails
Diffstat (limited to 'perl-install/fs.pm')
-rw-r--r--perl-install/fs.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 9e7cee59b..0fc606b8a 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -608,7 +608,7 @@ sub mount {
my @fs_modules = qw(vfat hfs romfs ufs reiserfs xfs jfs ext3);
if (member($fs, 'smb', 'smbfs', 'nfs') && $::isStandalone) {
- system('mount', '-t', $fs, $dev, $where, '-o', $options) == 0 or die _("mount failed");
+ system('mount', '-t', $fs, $dev, $where, '-o', $options) == 0 or die _("mounting partition %s in directory %s failed", $dev, $where);
return; #- do not update mtab, already done by mount(8)
} elsif (member($fs, 'ext2', 'proc', 'usbdevfs', 'iso9660', @fs_modules)) {
$dev = devices::make($dev) if $fs ne 'proc' && $fs ne 'usbdevfs';
@@ -637,13 +637,13 @@ sub mount {
}
if ($fs eq 'ext3' && $::isInstall) {
# ext3 mount to use the journal
- syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die _("mount failed: ") . "$!";
+ syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die _("mounting partition %s in directory %s failed", $dev, $where) . " ($!)";
syscall_('umount', $where);
# really mount as ext2 during install for speed up
$fs = 'ext2';
}
log::l("calling mount($dev, $where, $fs, $flag, $mount_opt)");
- syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die _("mount failed: ") . "$!";
+ syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die _("mounting partition %s in directory %s failed", $dev, $where) . " ($!)";
} else {
log::l("skipping mounting $fs partition");
return;