diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-11-15 17:55:50 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-11-15 17:55:50 +0000 |
| commit | 00e82f0c580fbe103517e7fe1a4e56479bc08699 (patch) | |
| tree | 90a815d6b19093fef8347749d7289b854bde2361 /perl-install/fs | |
| parent | d15186aabeeff04574674e8937432c854484c03a (diff) | |
| download | drakx-00e82f0c580fbe103517e7fe1a4e56479bc08699.tar drakx-00e82f0c580fbe103517e7fe1a4e56479bc08699.tar.gz drakx-00e82f0c580fbe103517e7fe1a4e56479bc08699.tar.bz2 drakx-00e82f0c580fbe103517e7fe1a4e56479bc08699.tar.xz drakx-00e82f0c580fbe103517e7fe1a4e56479bc08699.zip | |
handle "users" the way "user" is handled
Diffstat (limited to 'perl-install/fs')
| -rw-r--r-- | perl-install/fs/mount_options.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm index e31db1653..d08013faa 100644 --- a/perl-install/fs/mount_options.pm +++ b/perl-install/fs/mount_options.pm @@ -48,8 +48,8 @@ sub unpack { my %options = map { $_ => '' } keys %$non_defaults; my @unknown; foreach (split(",", $packed_options)) { - if ($_ eq 'user') { - $options{$_} = 1 foreach 'user', @$user_implies; + if (member($_, 'user', 'users')) { + $options{$_} = 1 foreach $_, @$user_implies; } elsif (exists $non_defaults->{$_}) { $options{$_} = 1; } elsif ($defaults->{$_}) { @@ -84,8 +84,9 @@ sub pack_ { push @l, 'umask=' . min(@umasks); } - if (delete $options->{user}) { - push @l, 'user'; + if (my $user = find { delete $options->{$_} } 'users', 'user') { + push @l, $user; + delete $options->{user}; foreach (@$user_implies) { if (!delete $options->{$_}) { # overriding |