From aecbd70fe871e1d908e7e3c5d4d497ad3bf572ba Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 10 Sep 2007 11:26:20 +0000 Subject: - library: have "defaults" mount option instead of empty string (for rescue) --- perl-install/NEWS | 1 + perl-install/fs.pm | 2 +- perl-install/fs/mount_options.pm | 2 +- 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(); } -- cgit v1.2.1