summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-31 11:45:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-31 11:45:43 +0000
commitd8e011c0484d0feecf118140ef0f04d3525cdd62 (patch)
tree849d7811e994ab03b7ceb1522f6ec0647cd30ff8
parentcc9c97d2c8f4aee456549a87ce096f064f52a7e2 (diff)
downloaddrakx-d8e011c0484d0feecf118140ef0f04d3525cdd62.tar
drakx-d8e011c0484d0feecf118140ef0f04d3525cdd62.tar.gz
drakx-d8e011c0484d0feecf118140ef0f04d3525cdd62.tar.bz2
drakx-d8e011c0484d0feecf118140ef0f04d3525cdd62.tar.xz
drakx-d8e011c0484d0feecf118140ef0f04d3525cdd62.zip
(g_auto_install): installClass removed
(setPackages): do not preselect compssUsers entries
-rw-r--r--perl-install/install_any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 3b0d0d16c..9e6f859e2 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -310,7 +310,7 @@ sub setPackages {
pkgs::readCompssUsers($o->{packages}, $o->{meta_class});
$o->{compssUsersChoice}{SYSTEM} = 1;
- $o->{compssUsersChoice}{$_} = 1 foreach map { @{$o->{compssUsers}{$_}} } @{$o->{compssUsersSorted}};
+# $o->{compssUsersChoice}{$_} = 1 foreach map { @{$o->{compssUsers}{$_}} } @{$o->{compssUsersSorted}};
foreach (map { substr($_, 0, 2) } lang::langs($o->{langs})) {
push @{$o->{default_packages}}, pkgs::packageByName($o->{packages}, "locales-$_") || next;
@@ -527,7 +527,7 @@ sub g_auto_install(;$) {
my @fields = qw(mntpoint type size);
$o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
- exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse wacom netc timezone superuser intf keyboard mkbootdisk users installClass partitioning isUpgrade manualFstab nomouseprobe crypto security netcnx useSupermount autoExitInstall); #- TODO modules bootloader
+ exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse wacom netc timezone superuser intf keyboard mkbootdisk users partitioning isUpgrade manualFstab nomouseprobe crypto security netcnx useSupermount autoExitInstall); #- TODO modules bootloader
if (my $card = $::o->{X}{card}) {
$o->{X}{$_} = $::o->{X}{$_} foreach qw(default_depth resolution_wanted);