From 495ed1f595998aeaa7826d54ed555d26328bba02 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 27 Feb 2013 19:46:04 +0000
Subject: (really_all_fstab) do not put entry for CD/DVD in /etc/fstab
 (mga#7657)

---
 perl-install/fs/get.pm    | 2 +-
 perl-install/install/NEWS | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install')

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
 
-- 
cgit v1.2.1