summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-11-25 21:06:30 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-11-25 21:06:30 +0100
commitfe979d50ba183c76a0afbaa19952cc8e807d5dc7 (patch)
tree13554a828d937f909d33951899a2d572b3ec57ac /perl-install
parenta28b596634493925f75ad6e8dbdd73ea7a6fff07 (diff)
downloaddrakx-fe979d50ba183c76a0afbaa19952cc8e807d5dc7.tar
drakx-fe979d50ba183c76a0afbaa19952cc8e807d5dc7.tar.gz
drakx-fe979d50ba183c76a0afbaa19952cc8e807d5dc7.tar.bz2
drakx-fe979d50ba183c76a0afbaa19952cc8e807d5dc7.tar.xz
drakx-fe979d50ba183c76a0afbaa19952cc8e807d5dc7.zip
do not crash if fstab contains a bind mount
rationale: it crashes on a file (mga#14657)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs.pm4
-rw-r--r--perl-install/install/NEWS3
3 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 360a5784a..d38bd681d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o do not crash if fstab contains a bind mount on a file (mga#14657)
+
Version 16.46 - 25 November 2014
- harddrake:
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index d2a8fd1fc..f3fcdf188 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -209,7 +209,9 @@ sub prepare_write_fstab {
$comment ||= "# Entry for /dev/$_->{device} :\n" if $device =~ /^(UUID|LABEL)=/;
my $real_mntpoint = $_->{mntpoint} || ${{ '/tmp/hdimage' => '/mnt/hd' }}{$_->{real_mntpoint}};
- mkdir_p("$o_prefix$real_mntpoint") if $real_mntpoint =~ m|^/|;
+ if (!member('bind', split(',', $_->{options}))) {
+ mkdir_p("$o_prefix$real_mntpoint") if $real_mntpoint =~ m|^/|;
+ }
my $mntpoint = fs::type::carry_root_loopback($_) ? '/initrd/loopfs' : $real_mntpoint;
my ($freq, $passno) =
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 0269e1387..59e8c8368 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader config:
+ o do not crash if fstab contains a bind mount on a file (mga#14657)
+
Version 16.45 - 26 October 2014
- drakx-in-chroot: