summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-10 11:26:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-10 11:26:20 +0000
commitaecbd70fe871e1d908e7e3c5d4d497ad3bf572ba (patch)
treead4c3e57f4320026579eb2c1160618d2d7f4eac2
parent4c19e8d45e5018145ef0b2a3d797ab1bdb334b0c (diff)
downloaddrakx-aecbd70fe871e1d908e7e3c5d4d497ad3bf572ba.tar
drakx-aecbd70fe871e1d908e7e3c5d4d497ad3bf572ba.tar.gz
drakx-aecbd70fe871e1d908e7e3c5d4d497ad3bf572ba.tar.bz2
drakx-aecbd70fe871e1d908e7e3c5d4d497ad3bf572ba.tar.xz
drakx-aecbd70fe871e1d908e7e3c5d4d497ad3bf572ba.zip
- library: have "defaults" mount option instead of empty string (for rescue)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs.pm2
-rw-r--r--perl-install/fs/mount_options.pm2
3 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ae9fa13ac..62e722772 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- localedrake
o drop support for iiimf
- list jmicron driver in disk/ide
+- library: have "defaults" mount option instead of empty string (for rescue)
Version 10.4.190 - 5 September 2007, by Thierry Vignaud
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 23c7547e9..48ecc2822 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -253,7 +253,7 @@ sub prepare_write_fstab {
my $file_dep = $options =~ /\b(loop|bind)\b/ ? $device : '';
- [ $file_dep, $mntpoint, $comment . join(' ', $device, $mntpoint, $fs_type, $options || 'defaults', $freq, $passno) . "\n" ];
+ [ $file_dep, $mntpoint, $comment . join(' ', $device, $mntpoint, $fs_type, $options, $freq, $passno) . "\n" ];
} else {
();
}
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 3c8f1b283..f5faed630 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -103,7 +103,7 @@ sub pack_ {
}
sub pack {
my ($part, $options, $unknown) = @_;
- $part->{options} = pack_($part, $options, $unknown);
+ $part->{options} = pack_($part, $options, $unknown) || 'defaults';
noreturn();
}