summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-09-04 13:39:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-09-04 13:39:08 +0000
commit226ddfc44b5bfe5135e60fa93b8449d4f5d4f56e (patch)
tree9966522d74b359117cbd9d426588d7a3c0743ee9 /perl-install
parent04b8520f879a38df646f5597c2b6bcf080caf873 (diff)
downloaddrakx-backup-do-not-use-226ddfc44b5bfe5135e60fa93b8449d4f5d4f56e.tar
drakx-backup-do-not-use-226ddfc44b5bfe5135e60fa93b8449d4f5d4f56e.tar.gz
drakx-backup-do-not-use-226ddfc44b5bfe5135e60fa93b8449d4f5d4f56e.tar.bz2
drakx-backup-do-not-use-226ddfc44b5bfe5135e60fa93b8449d4f5d4f56e.tar.xz
drakx-backup-do-not-use-226ddfc44b5bfe5135e60fa93b8449d4f5d4f56e.zip
handle no options in fs::mount (is it really needed?... it should not!)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index b16f5ed8b..cf44be56b 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -678,7 +678,7 @@ sub mount {
my @fs_modules = qw(vfat hfs romfs ufs reiserfs xfs jfs ext3);
if (member($fs, 'smb', 'smbfs', 'nfs', 'davfs', 'ntfs') && $::isStandalone) {
- system('mount', '-t', $fs, $dev, $where, '-o', $options) == 0 or die _("mounting partition %s in directory %s failed", $dev, $where);
+ system('mount', '-t', $fs, $dev, $where, if_($options, '-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)) {
$where =~ s|/$||;