remove pcmcia_probe (not needed on server, and need to investigate why this cause KVM trouble...

7 files changed, 25 insertions, 30 deletions

diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index fe0bdb16c..fecdff8e0 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -151,7 +151,7 @@ our %l = (
       ),
     ],
     virtual => [ qw(xenblk virtio_blk) ],
-    pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs pata_pcmcia sym53c500_cs) ],
+#    pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs pata_pcmcia sym53c500_cs) ],
     raw => [ qw(ide-gd_mod sd_mod) ],
     usb => [ qw(usb-storage) ],
     firewire => [ qw(sbp2) ],
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 6d30161c9..9b3b5c01b 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -127,10 +127,10 @@ BINS = init stage1 dhcp-client rescue-gui probe-modules
 
 DIRS += pci-resource usb-resource slang newt ppp/pppd rp-pppoe/src
 ifeq (i386, $(ARCH))
-DIRS += pcmcia pcmcia-resource sysfs
+DIRS += sysfs
 endif
 ifeq (x86_64, $(ARCH))
-DIRS += pcmcia pcmcia-resource sysfs
+DIRS += sysfs
 endif
 
 
diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL
index ea99f60bb..e364d7995 100644
--- a/perl-install/c/Makefile.PL
+++ b/perl-install/c/Makefile.PL
@@ -15,7 +15,8 @@ WriteMakefile(
     'NAME'	=> 'stuff',
     'OPTIMIZE'  => '-Os',
     'MAKEFILE'  => 'Makefile_c',
-    'OBJECT'    => "stuff.o " . (-e $pcmcia_probe_o && " $pcmcia_probe_o"),
+    'OBJECT'    => "stuff.o ",
+#   'OBJECT'    => "stuff.o " . (-e $pcmcia_probe_o && " $pcmcia_probe_o"),
     'VERSION_FROM' => 'stuff.pm', # finds $VERSION
     'LIBS'	=> [$libs],   # e.g., '-lm' 
     'DEFINE'	=> '',     # e.g., '-DHAVE_SOMETHING' 
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
index cd2c6bf03..7afd69836 100644
--- a/perl-install/c/stuff.xs.pl
+++ b/perl-install/c/stuff.xs.pl
@@ -58,9 +58,6 @@ typedef __uint8_t u8;
 #include <parted/parted.h>
 ';
 
-$Config{archname} =~ /i.86/ and print '
-char *pcmcia_probe(void);
-';
 
 print '
 
@@ -108,11 +105,6 @@ MODULE = c::stuff		PACKAGE = c::stuff
 
 ';
 
-$Config{archname} =~ /i.86/ and print '
-char *
-pcmcia_probe()
-';
-
 print '
 int
 del_partition(hd, part_number)
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 42f14aff6..714db45fa 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -582,7 +582,7 @@ sub getSerialModem {
      $serialprobe{$device}{device} = $device;
      push @modems, $serialprobe{$device};
     }
-    my @devs = pcmcia_probe();
+#    my @devs = pcmcia_probe();
     foreach my $modem (@modems) {
         #- add an alias for macserial on PPC
         $modules_conf->set_alias('serial', $serdev) if arch() =~ /ppc/ && $modem->{device};
@@ -905,14 +905,14 @@ sub firewire_probe() {
     @l;
 }
 
-sub pcmcia_controller_probe() {
-    my ($controller) =  probe_category('bus/pcmcia');
-    if (!$controller && !$::testing && !$::noauto && arch() =~ /i.86/) {
-        my $driver = c::pcmcia_probe();
-        $controller = { driver => $driver, description => "PCMCIA controller ($driver)" } if $driver;
-    }
-    $controller;
-}
+#sub pcmcia_controller_probe() {
+#    my ($controller) =  probe_category('bus/pcmcia');
+#    if (!$controller && !$::testing && !$::noauto && arch() =~ /i.86/) {
+#        my $driver = c::pcmcia_probe();
+#        $controller = { driver => $driver, description => "PCMCIA controller ($driver)" } if $driver;
+#    }
+#    $controller;
+#}
 
 sub pcmcia_probe() {
     require modalias;
@@ -954,11 +954,11 @@ sub dmi_probe() {
 sub probeall() {
     return if $::noauto;
 
-    pci_probe(), usb_probe(), firewire_probe(), pcmcia_probe(), dmi_probe(), getInputDevices_and_usb();
+    pci_probe(), usb_probe(), firewire_probe(), dmi_probe(), getInputDevices_and_usb();
 }
 sub probeall_update_cache() {
     return if $::noauto;
-    @pci = pci_probe__real(), @usb = usb_probe__real(), firewire_probe(), pcmcia_probe(), dmi_probe();
+    @pci = pci_probe__real(), @usb = usb_probe__real(), firewire_probe(), dmi_probe();
 }
 sub matching_desc__regexp {
     my ($regexp) = @_;
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index dd8686752..f4318e92e 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -121,7 +121,8 @@ our @tree =
       string => N("PCMCIA controllers"),
       icon => "hw-pcmcia.png",
       configurator => "",
-      detector => sub { f(detect_devices::pcmcia_controller_probe()) },
+      #detector => sub { f(print "";detect_devices::pcmcia_controller_probe()) },
+      detector => sub { f(print "Disable!";) },
       checked_on_boot => 1,
      },
 
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index a5d1fbc97..4b02368b2 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -1395,12 +1395,13 @@ sub deploy_server_notify {
 #-###############################################################################
 sub configure_pcmcia {
     my ($o) = @_;
-    my $controller = detect_devices::pcmcia_controller_probe();
-    $o->{pcmcia} ||= $controller && $controller->{driver} or return;
-    log::l("configuring PCMCIA controller ($o->{pcmcia})");
-    symlink "/tmp/stage2/$_", $_ foreach "/etc/pcmcia";
-    eval { modules::load($o->{pcmcia}, 'pcmcia') };
-    run_program::run("/lib/udev/pcmcia-socket-startup");
+    log::l("configuring PCMCIA cdisable");
+#    my $controller = detect_devices::pcmcia_controller_probe();
+#    $o->{pcmcia} ||= $controller && $controller->{driver} or return;
+#    log::l("configuring PCMCIA controller ($o->{pcmcia})");
+#    symlink "/tmp/stage2/$_", $_ foreach "/etc/pcmcia";
+#    eval { modules::load($o->{pcmcia}, 'pcmcia') };
+#    run_program::run("/lib/udev/pcmcia-socket-startup");
 }
 
 1;