no_comment

9 files changed, 33 insertions, 23 deletions

diff --git a/make_boot_img b/make_boot_img
index 1eb721e96..e8392dfaf 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -50,9 +50,7 @@ sub initrd {
     my ($mnt, $img) = @_;
     my ($ltype, $I) = $type =~ /(.*?)(64)/; $ltype ||= $type;
     my $tmp = "$ENV{HOME}/tmp/initrd";
-    my $tar = "$instdir/install1_$type.$arch.tar.bz2";
-    -e $tar or $tar = "$instdir/install1.$arch.tar.bz2";
-    -e $tar or $tar = "$instdir/install1.tar.bz2";
+    my $tar = "$instdir/install1.tar.bz2";
 
     __ "$sudo umount $tmp $mnt 2>/dev/null";
     _ "dd if=/dev/zero of=$tmp bs=1k count=2000";
@@ -63,6 +61,12 @@ sub initrd {
     install_s("$instdir/installinit/init", "$mnt/sbin");
     install_s("$instdir/$install", "$mnt/sbin/install");
 
+    if ($type eq "pcmcia") {
+	unlink "$mnt/sbin/sh";
+	_ "$sudo cp -a tools/$arch/sh $mnt/sbin";
+	_ "$sudo cp -a /etc/pcmcia $mnt/etc";
+	_ "$sudo patch -p0 -d $mnt/etc < $instdir/pcmcia_config.patch";
+    }
     _ "$sudo cp -f install_${type}_modules/* $mnt/modules/" if -d "install_${type}_modules";
     _ "$sudo cp -f modules$I/${ltype}_modules.cgz $mnt/modules/modules$I.cgz" if $type !~ /blank/;
     _ "$sudo cp -f modules$I/modules.dep $mnt/modules/";
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 247fa827a..e9a1b3986 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -579,6 +579,7 @@ sub bug {
       header("lsmod"), cat_("/proc/modules"),
       header("cmdline"), cat_("/proc/cmdline"),
       header("pcmcia: stab"), cat_("/var/run/stab"),
+      header("usb"), cat_("/proc/bus/usb/devices"),
       header("partitions"), cat_("/proc/partitions"),
       header("cpuinfo"), cat_("/proc/cpuinfo"),
       header("syslog"), cat_("/tmp/syslog"),
diff --git a/perl-install/common.pm b/perl-install/common.pm
index cea5a0be3..4ab8178a4 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -9,7 +9,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $printable_chars $sizeof_int $bitof_int
     common     => [ qw(__ even odd arch better_arch compat_arch min max sqr sum and_ or_ sign product bool invbool listlength bool2text bool2yesno text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX formatLines deref next_val_in_array) ],
     functional => [ qw(fold_left compose mapgrep map_index grep_index find_index map_each grep_each list2kv map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie combine) ],
     file       => [ qw(dirname basename touch all glob_ cat_ output symlinkf chop_ mode typeFromMagic expand_symlinks) ],
-    system     => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ salt getVarsFromSh setVarsInSh setVarsInCsh substInFile availableRam availableMemory removeXiBSuffix template2file template2userfile update_userkderc list_skels formatTime unix2dos setVirtual) ],
+    system     => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ salt getVarsFromSh setVarsInSh setVarsInCsh substInFile availableRam availableMemory removeXiBSuffix template2file template2userfile update_userkderc list_skels formatTime formatTimeRaw unix2dos setVirtual) ],
     constant   => [ qw($printable_chars $sizeof_int $bitof_int $SECTORSIZE %compat_arch) ],
 );
 @EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
@@ -585,7 +585,7 @@ sub removeXiBSuffix($) {
     $_;
 }
 
-sub formatTime($) {
+sub formatTime {
     my ($s, $m, $h) = gmtime($_[0]);
     if ($h) {
 	sprintf "%02d:%02d", $h, $m;
@@ -597,6 +597,10 @@ sub formatTime($) {
 	_("%d seconds", $s);
     }
 }
+sub formatTimeRaw {
+    my ($s, $m, $h) = gmtime($_[0]);
+    sprintf "%d:%02d:%02d", $h, $m, $s;
+}
 
 #- return the size of the partition and its free space in KiB
 sub df {
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 29f5114a0..49a31cf10 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -131,7 +131,7 @@ sub getFile {
 	    #- handling changing a media when some of the file on the first CD has been copied
 	    #- to other to avoid media change...
 	    my $f2 = "$postinstall_rpms/$f";
-	    $f2 = "/tmp/rhimage/$rel" unless -e $f2;
+	    $f2 = "/tmp/rhimage/$rel" unless $postinstall_rpms && -e $f2;
 	    log::l("local getFile $f2");
 	    open GETFILE, $f2 and *GETFILE;
 	}
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index 2fa917564..641d9ad59 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -18,11 +18,11 @@ use modules;
 
 
 sub tellAboutProprietaryModules {
-    my ($o);
+    my ($o) = @_;
     my @l = grep {$_} map { $_->{driver} =~ /^Bad:(.*)/ && $1 } detect_devices::probeall();
     $o->ask_warn('', 
 _("Some hardware on your computer needs ``proprietary'' drivers to work.
-You can find some information about them at: %s"), join(", ", @l)) if @l;
+You can find some information about them at: %s", join(", ", @l))) if @l;
 }
 
 sub partition_with_diskdrake {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 0b4430b42..cd2ec2fc0 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -354,7 +354,7 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
     pkgs::install($o->{prefix}, $o->{isUpgrade}, \@toInstall, $packages->[1], $packages->[2]);
     delete $ENV{DURING_INSTALL};
     run_program::rooted($o->{prefix}, 'ldconfig') or die "ldconfig failed!";
-    log::l("Install took: ", formatTime(time - $time));
+    log::l("Install took: ", formatTimeRaw(time - $time));
 }
 
 sub afterInstallPackages($) {
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 5206ecf2c..efe5912cd 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -20,6 +20,7 @@ sub suspend { my ($o) = @_; $o->{suspended} = common::setVirtual(1) }
 sub resume { my ($o) = @_; common::setVirtual(delete $o->{suspended}) }
 
 sub exit { 
+    gtkset_mousecursor_normal();
     c::_exit($_[0]) #- workaround 
 }
 
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index c7bd31622..3ed7e24fc 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -30,7 +30,7 @@ arch() =~ /^sparc/ ? (
   "3c90x" => "3Com 3c90x (Cyclone/Hurricane/Tornado)",
   "at1700" => "Allied Telesis AT1700",
   "ac3200" => "Ansel Communication AC3200",
-  "acenic" => "AceNIC Gigabit Ethernet",
+#BIG  "acenic" => "AceNIC Gigabit Ethernet",
   "pcnet32" => "AMD PC/Net 32",
   "82596" => "Apricot 82596",
 #  "atp" => "ATP", # builtin the kernel
@@ -82,10 +82,10 @@ arch() =~ /^sparc/ ? (
   "sb1000" => "sb1000",
   "sbni" => "sbni",
   "sis900" => "sis900",
-  "sk98lin" => "Syskonnect (Schneider & Koch)|Gigabit Ethernet",
+#BIG  "sk98lin" => "Syskonnect (Schneider & Koch)|Gigabit Ethernet",
 ),
   "3c59x" => "3com 3c59x (Vortex)",
-  "de4x5" => "Digital 425,434,435,450,500",
+#BIG  "de4x5" => "Digital 425,434,435,450,500",
   "rtl8139" => "RealTek RTL8129/8139",
 }],
 [ 'network', {
@@ -111,12 +111,12 @@ arch() =~ /^sparc/ ? (
   "advansys" => "AdvanSys Adapters",
   "in2000" => "Always IN2000",
   "AM53C974" => "AMD SCSI",
-  "BusLogic" => "BusLogic Adapters",
+#unsused  "BusLogic" => "BusLogic Adapters",
   "dtc" => "DTC 3180/3280",
-  "seagate" => "Future Domain TMC-885, TMC-950",
-  "fdomain" => "Future Domain TMC-16x0",
+#unsused  "seagate" => "Future Domain TMC-885, TMC-950",
+#unsused  "fdomain" => "Future Domain TMC-16x0",
   "initio" => "Initio",
-  "g_NCR5380" => "NCR 5380",
+#unsused  "g_NCR5380" => "NCR 5380",
   "NCR53c406a" => "NCR 53c406a",
   "53c7,8xx" => "NCR 53c7xx",
   "qlogicfas" => "Qlogic FAS",
@@ -128,12 +128,12 @@ arch() =~ /^sparc/ ? (
 
   "a100u2w" => "a100u2w",
   "atp870u" => "atp870u (Acard/Artop)",
-  "dc395x_trm" => "dc395x_trm",
+#unsused  "dc395x_trm" => "dc395x_trm",
   "psi240i" => "psi240i",
   "qlogicfc" => "qlogicfc",
   "sim710" => "sim710",
   "sym53c416" => "sym53c416",
-  "tmscsim" => "tmscsim",
+#unsused  "tmscsim" => "tmscsim",
 ),
   "aic7xxx" => "Adaptec 2740, 2840, 2940",
   "ncr53c8xx" => "NCR 53C8xx PCI",
@@ -153,15 +153,15 @@ arch() =~ /^sparc/ ? (
   "pluto" => "Sun SparcSTORAGE Array SCSI", #- name it "fc4:soc:pluto" ?
 ) : arch() =~ /alpha/ ? () : (
   "DAC960" => "Mylex DAC960",
-#  "dpt" => "Distributed Tech SmartCache/Raid I-IV Controller", # not there anymore?
+#unused  "dpt_i2o" => "Distributed Tech SmartCache/Raid I-IV Controller", # not there anymore?
   "megaraid" => "AMI MegaRAID",
   "aacraid" => "AACxxx Raid Controller",
   "cpqarray" => "Compaq Smart-2/P RAID Controller",
   "gdth" => "ICP Disk Array Controller",
   "ips" => "IBM ServeRAID controller",
-  "eata" => "EATA SCSI PM2x24/PM3224",
-  "eata_pio" => "EATA PIO Adapters",
-  "eata_dma" => "EATA DMA Adapters",
+#unused	 "eata" => "EATA SCSI PM2x24/PM3224",
+#unused	 "eata_pio" => "EATA PIO Adapters",
+#unused	 "eata_dma" => "EATA DMA Adapters",
   "ppa" => "Iomega PPA3 (parallel port Zip)",
   "imm" => "Iomega Zip (new driver)",
 ),
@@ -237,7 +237,7 @@ arch() !~ /^sparc/ ? (
   "3c589_cs" => "3c589_cs",
   "parport_cs" => "parport_cs", 
   "3c575_cb" => "3c575_cb",
-  "apa1480_cb" => "apa1480_cb",
+#unused  "apa1480_cb" => "apa1480_cb",
   "cb_enabler" => "cb_enabler",
   "epic_cb" => "epic_cb",
   "iflash2+_mtd" => "iflash2+_mtd",
diff --git a/tools/i386/sh b/tools/i386/sh
new file mode 100755
index 000000000..084a97837
--- /dev/null
+++ b/tools/i386/sh