no_comment

8 files changed, 23 insertions, 15 deletions

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index a0d0ad48a..1a3b0e6d8 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,9 +1,19 @@
+2000-10-02  Pixel  <pixel@mandrakesoft.com>
+
+	* mouse.pm (fullnames): fix i18n fix
+
+	* install_steps.pm (miscellaneous): don't add ide2=0x... for
+	ultra66 (otherwise chmouel is not happy, so is hdc being hde)
+	
+	* Xconfigurator.pm (main): add handling of icewm logout
+
+	* c/stuff.xs.pm: changed the stepping of "Progressing installing package"
+
 2000-10-02  dam's  <damien@mandrakesoft.com>
 
 	* netconnect.pm (main): infos are written only when needed.
 	* netconnect.pm (intro): connection checking now works.
 	
-
 2000-10-02  Chmouel Boudjnah  <chmouel@mandrakesoft.com>
 
 	* pci_probing/pcitable: s|snd-card-via686a|via82cxxx_audio|; like
@@ -884,7 +894,6 @@
 	experimental support for expert users.
 	* install_steps_interactive.pm: removed question to keep XF3.
 
->>>>>>> 1.280
 2000-09-05  François Pons  <fpons@mandrakesoft.com>
 
 	* printerdrake.pm: removed all previous URI specific mode and
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 84e5f7867..d123dde46 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1097,6 +1097,7 @@ Current configuration is:
 			system("kwmcom logout") if /kwm/;
 			system("dcop kdesktop default logout") if /kwin/;
 			system("save-session --kill") if /gnome-session/;
+			system("killall -QUIT icewm") if /icewm/;
 
 			open STDIN, "</dev/zero";
 			open STDOUT, ">/dev/null";
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index d9107561f..0b047e563 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -768,7 +768,7 @@ rpmRunTransactions(trans, callbackOpen, callbackClose, callbackMessage, force)
       } break;
 
       case RPMCALLBACK_INST_PROGRESS:
-        if (total && (amount - last_amount) * 4 / total) {
+        if (total && (amount - last_amount) * 22 / 4 / total) {
           msg = "Progressing installing package";
           param_s = n;
           param_ul1 = &amount;
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 6a6869a0a..2e8ffc146 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -561,6 +561,8 @@ sub  install_cpio($$;@) {
 sub bug {
     my ($h) = getopts(\@_, "h");
     $h and die "usage: bug\nput file report.bug on fat formatted floppy\n";
+
+    require detect_devices;
     mount devices::make(first(detect_devices::floppies())), "/fd0";
 
     sub header { "
@@ -568,7 +570,6 @@ sub bug {
 * $_[0]
 ********************************************************************************";
     }
-    require detect_devices;
 
     local $\ = "\n";
     output "/fd0/report.bug", map { chomp; $_ }
diff --git a/perl-install/common.pm b/perl-install/common.pm
index d54eb9a2f..b3a6b05e5 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -429,11 +429,7 @@ sub getVarsFromSh($) {
 
 sub setVarsInSh {
     my ($file, $l, @fields) = @_;
-    @fields = keys %$l unless @fields;
-
-    local *F;
-    open F, "> $_[0]" or die "cannot create config file $file";
-    $l->{$_} and print F "$_=$l->{$_}\n" foreach @fields;
+    setVarsInShMode($file, 0777 ^ umask(), $l, @fields);
 }
 
 sub setVarsInShMode {
@@ -441,7 +437,7 @@ sub setVarsInShMode {
     @fields = keys %$l unless @fields;
 
     local *F;
-    open F, "> $_[0]" or die "cannot create config file $file";
+    open F, "> $file" or die "cannot create config file $file";
     chmod $mod, $file;
     $l->{$_} and print F "$_=$l->{$_}\n" foreach @fields;
 }
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index c66394474..ecb350543 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -830,7 +830,7 @@ sub miscellaneous {
 	$_ .= join('', map { " $_=autotune" } grep { /ide.*/ } all("/proc/ide")) if !/ide.=autotune/;
     }
     if (my $m = detect_devices::hasUltra66()) {
-	$_ .= " $m" if !/ide.=0x/;
+	#$_ .= " $m" if !/ide.=0x/;
     }
 
     #- keep some given parameters
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index c3d4e9c2a..5fa5b25b7 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -20,7 +20,7 @@ my @mouses_fields = qw(nbuttons MOUSETYPE XMOUSETYPE name);
 my %mice = 
  arch() =~ /^sparc/ ? 
 (
- __('SunMouse') =>
+ 'sunmouse' =>
  [ [ 'sunmouse' ],
    [ [ 3, 'sun', 'sun', __("Sun - Mouse") ]
    ]]
@@ -44,7 +44,7 @@ my %mice =
      [ 5, 'ps/2', 'IMPS/2', __("Wheel") ],
    ]],
 
- __("Serial") =>
+ __("serial") =>
  [ [ map { "ttyS$_" } 0..3 ],
    [ [ 2, 'Microsoft', 'Microsoft', __("Generic 2 Button Mouse") ],
      [ 3, 'Microsoft', 'Microsoft', __("Generic 3 Button Mouse") ],
@@ -61,13 +61,13 @@ my %mice =
      [ 3, 'Microsoft', 'ThinkingMouse', __("Kensington Thinking Mouse") ],
    ]],
 
- __('BusMouse') =>
+ __("busmouse") =>
  [ [ arch() eq 'ppc' ? 'adbmouse' : ('atibm', 'inportbm', 'logibm') ],
    [ [ 2, 'Busmouse', 'BusMouse', __("2 buttons") ],
      [ 3, 'Busmouse', 'BusMouse', __("3 buttons") ],
    ]],
 
- '[' . _('No bus') . ']' =>
+ __("none") =>
  [ [ 'none' ],
    [ [ 0, 'none', 'Microsoft', __("No mouse") ],
    ]],
diff --git a/perl-install/share/list b/perl-install/share/list
index ef2b768cd..12a1eb0aa 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -10,6 +10,7 @@
 /etc/protocols
 /etc/imrc
 /etc/im_palette.pal
+/sbin/badblocks
 /sbin/fdisk
 /sbin/insmod
 /sbin/mkraid