diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-02-21 10:31:45 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-02-21 10:31:45 +0000 |
| commit | 75bf8c28e750faa0beec21b63ea6990cd9a70bc6 (patch) | |
| tree | 3ea5df59b8fa616e6f7d5c300e610cd39ad313b0 | |
| parent | 1e9038420b7c3346617e966abdfbf75aba6f5bb3 (diff) | |
| download | drakx-backup-do-not-use-75bf8c28e750faa0beec21b63ea6990cd9a70bc6.tar drakx-backup-do-not-use-75bf8c28e750faa0beec21b63ea6990cd9a70bc6.tar.gz drakx-backup-do-not-use-75bf8c28e750faa0beec21b63ea6990cd9a70bc6.tar.bz2 drakx-backup-do-not-use-75bf8c28e750faa0beec21b63ea6990cd9a70bc6.tar.xz drakx-backup-do-not-use-75bf8c28e750faa0beec21b63ea6990cd9a70bc6.zip | |
nicer conditional displaying of nfs comment
| -rw-r--r-- | perl-install/network/nfs.pm | 4 | ||||
| -rw-r--r-- | perl-install/network/smbnfs.pm | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/perl-install/network/nfs.pm b/perl-install/network/nfs.pm index 6c9a02b6b..58b2dab28 100644 --- a/perl-install/network/nfs.pm +++ b/perl-install/network/nfs.pm @@ -14,6 +14,10 @@ sub to_fstab_entry { my ($class, $e) = @_; $class->to_fstab_entry_raw($e, 'nfs'); } +sub comment_to_string { + my ($class, $comment) = @_; + member($comment, qw(* 0.0.0.0/0.0.0.0 (everyone))) ? '' : $comment; +} sub from_dev { my ($class, $dev) = @_; $dev =~ m|(.*?):(.*)|; diff --git a/perl-install/network/smbnfs.pm b/perl-install/network/smbnfs.pm index 1958ce167..d380aac0f 100644 --- a/perl-install/network/smbnfs.pm +++ b/perl-install/network/smbnfs.pm @@ -13,18 +13,24 @@ sub server_to_string { my ($class, $server) = @_; $server->{name} || $server->{ip}; } +sub comment_to_string { + my ($class, $comment) = @_; + $comment; +} sub to_dev { my ($class, $e) = @_; $class->to_dev_raw($class->server_to_string($e->{server}), $e->{name} || $e->{ip}); } sub to_string { my ($class, $e) = @_; - ($e->{name} || $e->{ip}) . ($e->{comment} ? " ($e->{comment})" : ''); + my $comment = $class->comment_to_string($e->{comment}); + ($e->{name} || $e->{ip}) . ($comment ? " ($comment)" : ''); } sub to_fullstring { my ($class, $e) = @_; - $class->to_dev($e) . ($e->{comment} ? " ($e->{comment})" : ''); + my $comment = $class->comment_to_string($e->{comment}); + $class->to_dev($e) . ($comment ? " ($comment)" : ''); } sub to_fstab_entry_raw { my ($class, $e, $type) = @_; |