summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake/interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-03 09:25:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-03 09:25:59 +0000
commite9f498cb097dc5d70114ca03626e4bffc779bae5 (patch)
tree2a9590ad22633011e373d8df1ee1a5a70339d665 /perl-install/diskdrake/interactive.pm
parent399a8871344fd36a19996bd1d52e5ce0e34ada8a (diff)
downloaddrakx-e9f498cb097dc5d70114ca03626e4bffc779bae5.tar
drakx-e9f498cb097dc5d70114ca03626e4bffc779bae5.tar.gz
drakx-e9f498cb097dc5d70114ca03626e4bffc779bae5.tar.bz2
drakx-e9f498cb097dc5d70114ca03626e4bffc779bae5.tar.xz
drakx-e9f498cb097dc5d70114ca03626e4bffc779bae5.zip
move mount options related stuff from fs.pm to newly created fs/mount_options.pm
- fs::set_all_default_options() -> fs::mount_options::set_all_default() - fs::mount_options_pack() -> fs::mount_options::pack() - fs::mount_options_unpack() -> fs::mount_options::unpack() - fs::rationalize_options() -> fs::mount_options::rationalize() - fs::set_default_options() -> fs::mount_options::set_default() - fs::mount_options() -> fs::mount_options::list() - fs::mount_options_help() -> fs::mount_options::help()
Diffstat (limited to 'perl-install/diskdrake/interactive.pm')
-rw-r--r--perl-install/diskdrake/interactive.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 5bf3e436c..0a0e5cd6b 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -496,7 +496,7 @@ sub Create {
put_in_hash($part, fs::type::type_name2subpart($type_name));
$part->{mntpoint} = '' if isNonMountable($part);
$part->{mntpoint} = 'swap' if isSwap($part);
- fs::set_default_options($part);
+ fs::mount_options::set_default($part);
check($in, $hd, $part, $all_hds) or return 1;
$migrate_files = need_migration($in, $part->{mntpoint}) or return 1;
@@ -904,9 +904,9 @@ sub Options {
my @simple_options = qw(user noauto supermount username= password=);
- my (undef, $user_implies) = fs::mount_options();
- my ($options, $unknown) = fs::mount_options_unpack($part);
- my %help = fs::mount_options_help();
+ my (undef, $user_implies) = fs::mount_options::list();
+ my ($options, $unknown) = fs::mount_options::unpack($part);
+ my %help = fs::mount_options::help();
my $prev_user = $options->{user};
$in->ask_from(N("Mount options"),
@@ -926,7 +926,7 @@ sub Options {
if ($options->{encrypted}) {
# modify $part->{options} for the check
local $part->{options};
- fs::mount_options_pack($part, $options, $unknown);
+ fs::mount_options::pack($part, $options, $unknown);
if (!check($in, $hd, $part, $all_hds)) {
$options->{encrypted} = 0;
} elsif (!$part->{encrypt_key} && !isSwap($part)) {
@@ -944,7 +944,7 @@ sub Options {
},
) or return;
- fs::mount_options_pack($part, $options, $unknown);
+ fs::mount_options::pack($part, $options, $unknown);
1;
}