summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-30 09:46:01 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-30 09:46:01 +0000
commit775b965f86f890f93c3f27905a4ab7252e719c81 (patch)
tree2a8b40ffc1fc66b6694ffb7ebf8f553ba6cde5f9
parentaec4caf0d518b047cb4080766b332144b828eaa3 (diff)
downloaddrakx-775b965f86f890f93c3f27905a4ab7252e719c81.tar
drakx-775b965f86f890f93c3f27905a4ab7252e719c81.tar.gz
drakx-775b965f86f890f93c3f27905a4ab7252e719c81.tar.bz2
drakx-775b965f86f890f93c3f27905a4ab7252e719c81.tar.xz
drakx-775b965f86f890f93c3f27905a4ab7252e719c81.zip
- skip comments in /etc/crypttab (mga#9905)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/dmcrypt.pm1
-rw-r--r--perl-install/install/NEWS1
3 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index de62e0863..75e8bb911 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- skip comments in /etc/crypttab (mga#9905)
+
Version 15.46 - 29 April 2013
- logdrake:
diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm
index 0e5c3c19e..0cb73a848 100644
--- a/perl-install/fs/dmcrypt.pm
+++ b/perl-install/fs/dmcrypt.pm
@@ -33,6 +33,7 @@ sub read_crypttab_ {
my @raw_parts = grep { fs::type::isRawLUKS($_) } fs::get::really_all_fstab($all_hds);
foreach (cat_($crypttab)) {
+ next if /^#/;
my ($dm_name, $dev) = split;
my $raw_part = fs::get::device2part($dev, \@raw_parts)
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index eb38f6fc1..eab455d2f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- skip comments in /etc/crypttab (mga#9905)
- services:
o list 'shorewall-ipv6' along 'shorewall'