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()

2 files changed, 5 insertions, 5 deletions

diff --git a/perl-install/network/smb.pm b/perl-install/network/smb.pm
index 26b61c518..81b32f54e 100644
--- a/perl-install/network/smb.pm
+++ b/perl-install/network/smb.pm
@@ -15,9 +15,9 @@ sub to_fstab_entry {
     my ($class, $e) = @_;
     my $part = $class->to_fstab_entry_raw($e, 'smbfs');
     if ($e->{server}{username}) {
-	my ($options, $unknown) = fs::mount_options_unpack($part);
+	my ($options, $unknown) = fs::mount_options::unpack($part);
 	$options->{"$_="} = $e->{server}{$_} foreach qw(username password domain);
-	fs::mount_options_pack($part, $options, $unknown);
+	fs::mount_options::pack($part, $options, $unknown);
     }
     $part;
 }
@@ -122,11 +122,11 @@ sub fstab_entry_to_credentials {
 
     my ($server_name) = network::smb->from_dev($part->{device}) or return;
 
-    my ($options, $unknown) = fs::mount_options_unpack($part);
+    my ($options, $unknown) = fs::mount_options::unpack($part);
     $options->{'username='} && $options->{'password='} or return;
     my %h = map { $_ => delete $options->{"$_="} } qw(username domain password);
     $h{file} = $options->{'credentials='} = to_credentials($server_name, $h{username});
-    fs::mount_options_pack_($part, $options, $unknown), \%h;
+    fs::mount_options::pack_($part, $options, $unknown), \%h;
 }
 
 sub remove_bad_credentials {
diff --git a/perl-install/network/smbnfs.pm b/perl-install/network/smbnfs.pm
index 9e587a10f..c38903028 100644
--- a/perl-install/network/smbnfs.pm
+++ b/perl-install/network/smbnfs.pm
@@ -37,7 +37,7 @@ sub to_fullstring {
 sub to_fstab_entry_raw {
     my ($class, $e, $fs_type) = @_;
     my $fs_entry = { device => $class->to_dev($e), fs_type => $fs_type };
-    fs::set_default_options($fs_entry);
+    fs::mount_options::set_default($fs_entry);
     $fs_entry;
 }