summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-12 08:24:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-12 08:24:48 +0000
commitf09ee6700bf31fe5edc9d1070474346f8e4f3720 (patch)
treed390196adab7f6236373d059ea88e88ad7879473
parent84025b482354270070e0b00d15398ae3ab9e20c7 (diff)
downloaddrakx-f09ee6700bf31fe5edc9d1070474346f8e4f3720.tar
drakx-f09ee6700bf31fe5edc9d1070474346f8e4f3720.tar.gz
drakx-f09ee6700bf31fe5edc9d1070474346f8e4f3720.tar.bz2
drakx-f09ee6700bf31fe5edc9d1070474346f8e4f3720.tar.xz
drakx-f09ee6700bf31fe5edc9d1070474346f8e4f3720.zip
enhance based on perl_checker suggestion, but not using it :)
-rw-r--r--perl-install/fs.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index c93334429..f73182941 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -288,9 +288,8 @@ sub prepare_write_fstab {
# handle bloody supermount special case
if ($options =~ /supermount/) {
my @l = grep { $_ ne 'supermount' } split(',', $options);
- my @l1 = grep { member($_, 'ro', 'exec') } @l;
- my @l2 = difference2(\@l, \@l1);
- $options = join(",", "dev=$dev", "fs=$fs_type", @l1, if_(@l2, '--', @l2));
+ my ($l1, $l2) = partition { member($_, 'ro', 'exec') } @l;
+ $options = join(",", "dev=$dev", "fs=$fs_type", @$l1, if_(@$l2, '--', @$l2));
($dev, $fs_type) = ('none', 'supermount');
} else {
#- if we were using supermount, the type could be something like ext2:vfat