no_comment

7 files changed, 43 insertions, 6 deletions

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 97dc5e738..9f26dbe8f 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -4,6 +4,24 @@
 	* share/themes-mdk-Desktop.rc, share/themes/mdk-Desktop-bg.png:
 	initial release.
 
+2000-09-22  Pixel  <pixel@mandrakesoft.com>
+
+	* install_steps.pm: add some call to log_sizes to log the
+	installed size
+
+	* install_steps_gtk.pm (installPackages): beep before changeMedium		
+
+2000-09-21  Pixel  <pixel@mandrakesoft.com>
+
+	* interactive.pm (ask_from_listf): try to call the f translation
+	function on the default value with the index
+
+	* install_steps.pm (afterInstallPackages): make the gpg code work,
+	changed the call to 
+	"gpg --fast-import --homedir /etc/rpm /root/tmp/RPM-GPG-KEYS"
+
+	* detect_devices.pm: cleanup and removed unused code
+
 2000-09-21  Guillaume Cottenceau  <gc@mandrakesoft.com>
 
 	* detect_devices.pm (getNet()): really remove plip in standalone
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 84773836d..939a1ddaf 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -697,6 +697,7 @@ sub main {
 	last if $o->{step} eq 'exitInstall';
     }
     install_any::clean_postinstall_rpms();
+    install_any::log_sizes($o);
     install_any::ejectCdrom();
 
     $::live or fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount});
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 86afd29b9..d992302a8 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -691,4 +691,10 @@ sub getHds {
     $ok;
 }
 
+sub log_sizes {
+    my ($o) = @_;
+    my @df = common::df($o->{prefix});
+    log::l(sprintf "Installed: %dMB(df), %dMB(rpm)", ($df[0] - $df[1]) / 1024, sum(`rpm --root $o->{prefix} -qa --queryformat "%{size}\n"`) / sqr(1024));
+}
+
 1;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index eca7b612d..bde4d8d18 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -361,6 +361,7 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
     delete $ENV{DURING_INSTALL};
     run_program::rooted($o->{prefix}, 'ldconfig') or die "ldconfig failed!";
     log::l("Install took: ", formatTimeRaw(time - $time));
+    log_sizes($o);
 }
 
 sub afterInstallPackages($) {
@@ -431,9 +432,12 @@ Consoles 1,3,4,7 may also contain interesting information";
 	install_any::install_urpmi($o->{prefix}, $o->{method}, $o->{packages}[2]);
 	substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec;
     }
-
-    install_any::getAndSaveFile('RPM-GPG-KEYS', '/root/tmp/RPM-GPG-KEYS');
-    run_program::rooted($o->{prefix}, qw(gpg --fast-import --keyring /etc/rpm/pubring.gpg /root/tmp/RPM-GPG-KEYS));
+    {
+	my $f = "$o->{prefix}/root/tmp/RPM-GPG-KEYS";
+	install_any::getAndSaveFile('RPM-GPG-KEYS', $f);
+	run_program::rooted($o->{prefix}, qw(gpg --import --homedir /etc/rpm /root/tmp/RPM-GPG-KEYS));
+	unlink $f;
+    }
 
 #    #- update language and icons for KDE.
 #    update_userkderc($o->{prefix}, 'Locale', Language => "");
@@ -837,7 +841,11 @@ sub generateAutoInstFloppy($) {
 }
 
 #------------------------------------------------------------------------------
-sub exitInstall { install_any::unlockCdrom }
+sub exitInstall { 
+    my ($o) = @_;
+    install_any::unlockCdrom;
+    install_any::log_sizes($o);
+}
 
 #------------------------------------------------------------------------------
 sub hasNetwork {
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index 5a0f704b1..2005d4fe2 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -80,7 +80,7 @@ sub exitInstall {
 	my $O = bless $o, "install_steps_gtk";
 	$O->exitInstall($alldone);
     } else {
-	install_steps::exitInstall;
+	install_steps::exitInstall($o);
 	print "\a";
 	print "Auto installation complete (the postInstall is done yet though)\n";
 	print "Press <Enter> to reboot\n";
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 6eb6ac2d7..3d1a6bfa0 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -526,6 +526,7 @@ If you don't have it, press Cancel to avoid installation from this Cd-Rom.", pkg
 	#- if not using a cdrom medium, always abort.
 	$method eq 'cdrom' and do {
 	    local $my_gtk::grab = 1;
+	    print "\a";
 	    $o->ask_okcancel('', $msg);
 	};
     };
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 8096c4a0c..46c4250d1 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -97,12 +97,15 @@ sub ask_from_listf_ {
 }
 sub ask_from_listf {
     my ($o, $title, $message, $f, $l, $def) = @_;
+    my $def2;
     my (@l,%l); my $i = 0; foreach (@$l) {
 	my $v = $f->($_, $i++);
 	push @l, $v;
 	$l{$v} = $_;
+	$def2 = $v if $def && $_ eq $def;
     }
-    my $r = ask_from_list($o, $title, $message, \@l, defined $def ? $f->($def) : $def) or return;
+    $def2 ||= $f->($def) if $def;
+    my $r = ask_from_list($o, $title, $message, \@l, $def2) or return;
     $l{$r};
 }