diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-11-21 14:54:53 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-11-21 14:54:53 +0000 |
| commit | 34be445681c8dc42b73e95b80464ebad33503e8e (patch) | |
| tree | a0b7a8d1f57a339195ca6e2cc17d0dde80e63f07 /perl-install | |
| parent | 06e0bdfe68920691681c0db04f31dc1c90fdad98 (diff) | |
| download | drakx-34be445681c8dc42b73e95b80464ebad33503e8e.tar drakx-34be445681c8dc42b73e95b80464ebad33503e8e.tar.gz drakx-34be445681c8dc42b73e95b80464ebad33503e8e.tar.bz2 drakx-34be445681c8dc42b73e95b80464ebad33503e8e.tar.xz drakx-34be445681c8dc42b73e95b80464ebad33503e8e.zip | |
migrate pcmcia in drakx to use in-kernel version (only
for 2.4, though --> pcmcia in 2.2 no longer supported)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/c/Makefile.PL | 6 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/modules.pm | 8 |
4 files changed, 14 insertions, 6 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 51acbc583..4a7c0daf1 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -100,7 +100,7 @@ ifeq (sparc,$(ARCH)) ln -s /usr/X11R6/lib/X11/xkb/xkbcomp $(DEST)/usr/bin/xkbcomp endif ifeq (i386,$(ARCH)) - install -s ../all.kernels/*/cardmgr/cardmgr-* $(DEST)/usr/bin + install -s /sbin/cardmgr $(DEST)/usr/bin endif for i in `cat /tmp/list`; do \ diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL index e4d13859a..206ab4ef1 100644 --- a/perl-install/c/Makefile.PL +++ b/perl-install/c/Makefile.PL @@ -7,15 +7,15 @@ my $libs = '-lldetect -lext2fs'; $libs .= ' -L/usr/X11R6/lib -lX11 -lgdk -lXxf86misc' if $ENV{C_DRAKX}; $libs .= ' -lrpm -lrpmdb -lrpmio -lz' if $ENV{C_RPM}; -my $pcmcia_dir = $ENV{C_DRAKX} && $Config{archname} =~ /i.86/ ? '../../mdk-stage1/pcmcia' : ''; +my $pcmcia_dir = $ENV{C_DRAKX} && $Config{archname} =~ /i.86/ ? '../../mdk-stage1/pcmcia_' : ''; -symlink "$pcmcia_dir/pcmcia_probe.c", "pcmcia_probe.c" if $pcmcia_dir; +symlink "$pcmcia_dir/probe.c", "probe.c" if $pcmcia_dir; WriteMakefile( 'NAME' => 'stuff', 'OPTIMIZE' => '-Os', 'MAKEFILE' => 'Makefile_c', - 'OBJECT' => "stuff.o smp.o sbus.o silo.o" . ($pcmcia_dir && " pcmcia_probe.o"), + 'OBJECT' => "stuff.o smp.o sbus.o silo.o" . ($pcmcia_dir && " probe.o"), 'VERSION_FROM' => 'stuff.pm', # finds $VERSION 'LIBS' => [$libs], # e.g., '-lm' 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 5ad33d267..e34187bad 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -289,7 +289,9 @@ sub setupSCSI { if (!$::noauto && arch() =~ /i.86/) { if ($o->{pcmcia} ||= !$::testing && c::pcmcia_probe()) { my $w = $o->wait_message(_("PCMCIA"), _("Configuring PCMCIA cards...")); - modules::configure_pcmcia($o->{pcmcia}); + my $results = modules::configure_pcmcia($o->{pcmcia}); + $w = undef; + $results and $o->ask_warn('', $results); } } { diff --git a/perl-install/modules.pm b/perl-install/modules.pm index cec1fa16f..c48cf87ba 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -807,6 +807,12 @@ sub configure_pcmcia { return if $running; $running = 1; + if (c::kernel_version() =~ /^2\.2/) { + my $msg = _("PCMCIA support no longer exist for 2.2 kernels. Please use a 2.4 kernel."); + log::l($msg); + return $msg; + } + log::l("i try to configure pcmcia services"); symlink "/tmp/stage2/$_", $_ foreach "/etc/pcmcia"; @@ -818,7 +824,7 @@ sub configure_pcmcia { }; #- run cardmgr in foreground while it is configuring the card. - run_program::run("cardmgr-" . c::kernel_version(), "-f", "-m" ,"/modules"); + run_program::run("cardmgr", "-f", "-m" ,"/modules"); sleep(3); #- make sure to be aware of loaded module by cardmgr. |