summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-04-21 12:42:57 +0000
committerFrancois Pons <fpons@mandriva.com>2000-04-21 12:42:57 +0000
commitf3b08d4d16cd2e89dc64f3d7025c413de6e2ea0e (patch)
treea59b7df249a766be1e1196fb6ecc8b62510f46c8
parent68025cc5c4127b2fbd5dad7be8a86ee0dc43fc8f (diff)
downloaddrakx-f3b08d4d16cd2e89dc64f3d7025c413de6e2ea0e.tar
drakx-f3b08d4d16cd2e89dc64f3d7025c413de6e2ea0e.tar.gz
drakx-f3b08d4d16cd2e89dc64f3d7025c413de6e2ea0e.tar.bz2
drakx-f3b08d4d16cd2e89dc64f3d7025c413de6e2ea0e.tar.xz
drakx-f3b08d4d16cd2e89dc64f3d7025c413de6e2ea0e.zip
*** empty log message ***
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/install_steps_gtk.pm2
-rw-r--r--perl-install/install_steps_interactive.pm4
-rw-r--r--perl-install/modules.pm2
-rw-r--r--perl-install/pkgs.pm12
5 files changed, 15 insertions, 7 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 4827b474e..665cdc391 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -486,7 +486,7 @@ sub setupFB {
my ($o, $vga) = @_;
#- install needed packages for frame buffer.
- $o->installPackages(qw(kernel-fb XFree86-FBDev));
+ $o->pkg_install(qw(kernel-fb XFree86-FBDev));
$vga ||= 785; #- assume at least 640x480x16.
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 34447fbc9..26ae19a4a 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -317,7 +317,7 @@ _("If you wish to install less than this size,
select the percentage of packages that you want to install.
A low percentage will install only the most important packages;
-a percentage of 100% will install all selected packages.") :
+a percentage of 100%% will install all selected packages.") :
_("You have space on your disk for only %d%% of these packages.
If you wish to install less than this,
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 315bf1e2f..ac71b01b0 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -654,7 +654,7 @@ _("Use NIS") => { val => \$o->{authentication}{NIS}, type => 'bool', text => _("
sub addUser {
my ($o, $clicked) = @_;
my $u = $o->{user} ||= {};
- if ($::beginner || $o->{security} < 1) {
+ if ($o->{security} < 1) {
add2hash_($u, { name => "mandrake", password => "mandrake", realname => "default", icon => 'automagic' });
$o->{users} ||= [ $u ];
}
@@ -663,7 +663,7 @@ sub addUser {
my @fields = qw(realname name password password2);
my @shells = install_any::shells($o);
- if (($o->{security} >= 2 && !$::beginner || $clicked)) {
+ if (($o->{security} >= 1 || $clicked)) {
$u->{icon} = translate($u->{icon});
if ($o->ask_from_entries_refH(
[ _("Add user"), _("Accept user"), $o->{security} >= 4 && !@{$o->{users}} ? () : _("Done") ],
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 9d17c352b..db1c7f415 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -123,7 +123,7 @@ arch() =~ /^sparc/ ? (
"atp870u" => "atp870u (Acard/Artop)",
"dc395x_trm" => "dc395x_trm",
"psi240i" => "psi240i",
-# "qlogicfc" => "qlogicfc", #- removed for instance.
+ "qlogicfc" => "qlogicfc",
"sim710" => "sim710",
"sym53c416" => "sym53c416",
"tmscsim" => "tmscsim",
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 35213e279..605dcb86e 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -913,7 +913,15 @@ sub install($$$;$$) {
}
--$nb; #- make sure the package is not taken into account as its medium is not selected.
}
- } while (scalar(@transToInstall) == 0); #- avoid null transaction, it a nop that cost a bit.
+ } while ($nb > 0 && scalar(@transToInstall) == 0); #- avoid null transaction, it a nop that cost a bit.
+ }
+
+ #- added to exit typically after last media unselected.
+ if ($nb == 0 && scalar(@transToInstall) == 0) {
+ cleanHeaders($prefix);
+
+ loopback::save_boot($loop_boot);
+ return;
}
#- extract headers for parent as they are used by callback.
@@ -1001,7 +1009,7 @@ sub install($$$;$$) {
c::headerFree(delete $_->{header}) foreach @transToInstall;
cleanHeaders($prefix);
- if (my @badpkgs = grep { !packageFlagInstalled($_) } @transToInstall) {
+ if (my @badpkgs = grep { !packageFlagInstalled($_) && $_->{medium}{selected} } @transToInstall) {
foreach (@badpkgs) {
log::l("bad package $_->{file}");
packageSetFlagSelected($_, 0);