From eb53575902c0282896e92d7d6d76a89bca420e5a Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 9 Nov 1999 18:13:02 +0000
Subject: *** empty log message ***

---
 perl-install/Xconfigurator.pm | 7 +++++--
 perl-install/commands.pm      | 6 +++---
 perl-install/install2.pm      | 3 ---
 perl-install/install_any.pm   | 6 ------
 perl-install/lang.pm          | 2 +-
 5 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 09aef33f7..a90ee8e5a 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -717,10 +717,13 @@ sub main {
 
     XF86check_link();
 
-    $o->{card} = cardConfiguration($o->{card}, $::noauto, $allowFB);
+    {
+	my $w = $in->wait_message('', _("Preparing X-Window configuration"), 1);
 
-    $o->{monitor} = monitorConfiguration($o->{monitor}, $o->{card}{server} eq 'FBDev');
+	$o->{card} = cardConfiguration($o->{card}, $::noauto, $allowFB);
 
+	$o->{monitor} = monitorConfiguration($o->{monitor}, $o->{card}{server} eq 'FBDev');
+    }
     my $ok = resolutionsConfiguration($o, auto => $::auto, noauto => $::noauto);
 
     $ok &&= testFinalConfig($o, $::auto);
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 120aa99b4..26d2a7eb3 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -497,12 +497,12 @@ sub lspci {
 }
 sub dmesg { print cat_("/tmp/syslog"); }
 
-my %cached_failed_install_cpio;
+#my %cached_failed_install_cpio;
 #- double space between sub and install_cpio cuz install_cpio is not a shell command
 sub  install_cpio($$) {
     my ($dir, $name) = @_; 
 
-    return if $cached_failed_install_cpio{"$dir $name"};
+#    return if $cached_failed_install_cpio{"$dir $name"};
     return "$dir/$name" if -e "$dir/$name";
 
     my $cpio = "$dir.cpio.bz2";
@@ -514,7 +514,7 @@ sub  install_cpio($$) {
     run_program::run("cd $dir ; bzip2 -cd $cpio | cpio -id $name $name/*");
 
     #- not found, cache result
-    return if $cached_failed_install_cpio{"$dir $name"} = ! -e "$dir/$name";
+#    return if $cached_failed_install_cpio{"$dir $name"} = ! -e "$dir/$name";
     "$dir/$name";
 }
 
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d80d6625f..e673e40e9 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -577,9 +577,6 @@ sub main {
     #- ala pixel? :-) [fpons]
     sync(); sync();
 
-    #- remounting read-only may avoid error if kernel is unable to umount fs.
-    install_any::remount_readonly($o, $o->{prefix});
-
     log::l("installation complete, leaving");
     print "\n" x 30;
 }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index aa9107456..ef36e6fca 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -244,12 +244,6 @@ sub searchAndMount4Upgrade {
     }
 }
 
-sub remount_readonly {
-    my ($o, $dir) = @_;
-    my $device = first(grep { $_->{mntpoint} eq $dir } @{$o->{fstab}});
-    eval { fs::mount_part($device, $device, 'readonly', 'remount') };
-}
-
 sub write_ldsoconf {
     my ($prefix) = @_;
     my $file = "$prefix/etc/ld.so.conf";
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 445a134c5..aa2bf1e3c 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -178,7 +178,7 @@ sub load_po($) {
 	-e ($f = "$_") and last foreach @INC;
 	$f = commands::install_cpio("$f/po", "$lang.po");
     }
-    local *F; open F, $f or return;
+    local *F; open F, $f; #- not returning here help avoiding reading the same multiple times.
     foreach (<F>) {
 	/^msgstr/ and $state = 1;
 	/^msgid/  && !$fuzzy and $state = 2;
-- 
cgit v1.2.1