summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-12-15 16:49:49 +0000
committerThierry Vignaud <tv@mandriva.org>2008-12-15 16:49:49 +0000
commit6599fbf06dcd3fab1a4f2e425c2051ac746b6ab8 (patch)
tree73ecfc7b0716a544f3c226c0d32ecb5c9c103aad
parentddff323054ed16eac45325b776432b930590858b (diff)
downloaddrakx-6599fbf06dcd3fab1a4f2e425c2051ac746b6ab8.tar
drakx-6599fbf06dcd3fab1a4f2e425c2051ac746b6ab8.tar.gz
drakx-6599fbf06dcd3fab1a4f2e425c2051ac746b6ab8.tar.bz2
drakx-6599fbf06dcd3fab1a4f2e425c2051ac746b6ab8.tar.xz
drakx-6599fbf06dcd3fab1a4f2e425c2051ac746b6ab8.zip
(write_fstab) fix crashing on writing fstab when using SMB (#46084)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs.pm1
2 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ef31d0041..54640ffc2 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- diskdrake:
+ o fix crashing on writing fstab when using SMB (#46084)
o fix racing with udev (#41832)
- scannerdrake:
o install task-scanning (so that xsane-gimp got installed)
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 4fc6fa7a2..2ecc946e2 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -306,6 +306,7 @@ sub write_fstab {
my ($s, $smb_credentials, $davfs_credentials) = prepare_write_fstab($fstab, $o_prefix, '');
renamef("$o_prefix/etc/fstab", "$o_prefix/etc/fstab.old");
output("$o_prefix/etc/fstab", $s);
+ require fs::remote::davfs;
fs::remote::smb::save_credentials($_) foreach @$smb_credentials;
fs::remote::davfs::save_credentials($davfs_credentials);
fs::dmcrypt::save_crypttab($all_hds) if @{$all_hds->{dmcrypts}};