summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install2.pm10
-rw-r--r--perl-install/install_any.pm33
-rw-r--r--perl-install/install_steps.pm1
-rw-r--r--perl-install/interactive_gtk.pm2
4 files changed, 25 insertions, 21 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 69d66d7e1..25333ee9e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -247,7 +247,7 @@ $o = $::o = {
bootloader => { onmbr => 1, linear => 0 },
autoSCSI => 0,
mkbootdisk => "fd0", # no mkbootdisk if 0 or undef, find a floppy with 1
- packages => [ qw() ],
+# packages => [ qw() ],
partitioning => { clearall => $::testing, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0 },
# partitions => [
# { mntpoint => "/boot", size => 16 << 11, type => 0x83 },
@@ -295,8 +295,8 @@ $o = $::o = {
SMBPASSWD => "passowrd",
SMBWORKGROUP => "AS3",
},
- superuser => { password => 'a', shell => '/bin/bash', realname => 'God' },
- user => { name => 'foo', password => 'bar', home => '/home/foo', shell => '/bin/bash', realname => 'really, it is foo' },
+# superuser => { password => 'a', shell => '/bin/bash', realname => 'God' },
+# user => { name => 'foo', password => 'bar', home => '/home/foo', shell => '/bin/bash', realname => 'really, it is foo' },
# keyboard => 'de',
# display => "192.168.1.9:0",
@@ -364,7 +364,9 @@ sub selectInstallClass {
$o->selectInstallClass(@install_classes);
$::expert = $o->{installClass} eq "expert";
-
+ addToBeDone {
+ install_any::setPackages($o); #update package list
+ } 'formatPartitions';
}
#------------------------------------------------------------------------------
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index e28bf4e59..f57050115 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -97,23 +97,24 @@ sub getAvailableSpace {
sub setPackages {
my ($o) = @_;
- my $useHdlist = $o->{method} !~ /nfs|hd/;
- eval { $o->{packages} = pkgs::psUsingHdlist() } if $useHdlist;
- $o->{packages} = pkgs::psUsingDirectory() if !$useHdlist || $@;
-
- pkgs::getDeps($o->{packages});
-
- $o->{compss} = pkgs::readCompss ($o->{packages});
- $o->{compssList} = pkgs::readCompssList($o->{packages});
- push @{$o->{base}}, "kernel-smp" if smp::detect();
-
- do {
- my $p = $o->{packages}{$_} or log::l(), next;
- pkgs::select($o->{packages}, $p, 1);
- } foreach @{$o->{base}};
-
+ unless ($o->{package}) {
+ my $useHdlist = $o->{method} !~ /nfs|hd/;
+ eval { $o->{packages} = pkgs::psUsingHdlist() } if $useHdlist;
+ $o->{packages} = pkgs::psUsingDirectory() if !$useHdlist || $@;
+
+ pkgs::getDeps($o->{packages});
+
+ $o->{compss} = pkgs::readCompss ($o->{packages});
+ $o->{compssList} = pkgs::readCompssList($o->{packages});
+ push @{$o->{base}}, "kernel-smp" if smp::detect();
+
+ do {
+ my $p = $o->{packages}{$_} or log::l(), next;
+ pkgs::select($o->{packages}, $p, 1);
+ } foreach @{$o->{base}};
+ }
+
pkgs::setShowFromCompss($o->{compss}, $o->{installClass}, $o->{lang});
-
pkgs::setSelectedFromCompssList($o->{compssList}, $o->{packages}, getAvailableSpace($o) * 0.7, $o->{installClass}, $o->{lang});
}
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index d5578eea4..5f0044f88 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -89,6 +89,7 @@ sub errorInStep($$) {}
#------------------------------------------------------------------------------
sub selectLanguage {
$o->{keyboard} ||= keyboard::lang2keyboard($o->{lang});
+ #PAD CHOICE ||=
selectKeyboard($o);
}
#------------------------------------------------------------------------------
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 03f41e745..854d7148f 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -118,7 +118,7 @@ sub ask_from_entries_refW {
create_packtable({}, @entry_list),
$w->create_okcancel));
-
+ $entries[0]->grab_focus();
$w->main();
}