diff options
| author | Aurélien Lefebvre <alefebvre@mandriva.com> | 2009-08-17 12:47:33 +0000 |
|---|---|---|
| committer | Aurélien Lefebvre <alefebvre@mandriva.com> | 2009-08-17 12:47:33 +0000 |
| commit | 20b45a155458c3714496a1ffa6a87201140d76d5 (patch) | |
| tree | 124cb6aa8860a3af054eef870654d1e65b05a08e | |
| parent | 37840927cc9d8066c59cce7de5c3880c5d335310 (diff) | |
| download | drakx-backup-do-not-use-20b45a155458c3714496a1ffa6a87201140d76d5.tar drakx-backup-do-not-use-20b45a155458c3714496a1ffa6a87201140d76d5.tar.gz drakx-backup-do-not-use-20b45a155458c3714496a1ffa6a87201140d76d5.tar.bz2 drakx-backup-do-not-use-20b45a155458c3714496a1ffa6a87201140d76d5.tar.xz drakx-backup-do-not-use-20b45a155458c3714496a1ffa6a87201140d76d5.zip | |
- diskdrake : never pass username/password as options with davfs2
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/fs/mount.pm | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 20165b364..0d1a0a7a5 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- diskdrake + o never pass username/password as options with davfs2 - adduserdrake o now use password weakness display - added password weakness display feature in interactive diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm index a3c6d3a28..3e2d36938 100644 --- a/perl-install/fs/mount.pm +++ b/perl-install/fs/mount.pm @@ -72,6 +72,9 @@ sub mount { fsck_jfs($dev, $o_wait_message); } elsif ($fs eq 'ext2' && !$b_rdonly) { fsck_ext2($dev, $o_wait_message); + } elsif ($fs eq 'davfs2') { + # username and password options should be handled by /etc/davfs2/secrets file + @mount_opt = grep { !/^(username|password)=/ } @mount_opt; } push @mount_opt, 'ro' if $b_rdonly; |