summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-02-27 19:46:04 +0000
committerThierry Vignaud <tv@mageia.org>2013-02-27 19:46:04 +0000
commit495ed1f595998aeaa7826d54ed555d26328bba02 (patch)
tree1995cc6cfe707338c7a5db34613a5181bf6b53e5 /perl-install
parent280fe32ad32ae5d45cbc8ebd4a4903bf0861afbf (diff)
downloaddrakx-495ed1f595998aeaa7826d54ed555d26328bba02.tar
drakx-495ed1f595998aeaa7826d54ed555d26328bba02.tar.gz
drakx-495ed1f595998aeaa7826d54ed555d26328bba02.tar.bz2
drakx-495ed1f595998aeaa7826d54ed555d26328bba02.tar.xz
drakx-495ed1f595998aeaa7826d54ed555d26328bba02.zip
(really_all_fstab) do not put entry for CD/DVD in /etc/fstab (mga#7657)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs/get.pm2
-rw-r--r--perl-install/install/NEWS1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/fs/get.pm b/perl-install/fs/get.pm
index 461984431..096402e6f 100644
--- a/perl-install/fs/get.pm
+++ b/perl-install/fs/get.pm
@@ -22,7 +22,7 @@ sub fstab {
sub really_all_fstab {
my ($all_hds) = @_;
my @l = fstab($all_hds);
- @l, @{$all_hds->{raw_hds}}, @{$all_hds->{nfss}}, @{$all_hds->{smbs}}, @{$all_hds->{davs}};
+ @l, (grep { !$_->{is_removable} } @{$all_hds->{raw_hds}}), @{$all_hds->{nfss}}, @{$all_hds->{smbs}}, @{$all_hds->{davs}};
}
sub fstab_and_holes {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index accaa9783..8bef7cb12 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- bootloader:
o allow installing grub2 on a partition (mga#8462)
o try harder not to have duplicate stuff on grub2 cmd line
+- do not put entry for CD/DVD in /etc/fstab (mga#7657)
Version 15.23 - 27 February 2013