diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-03-29 22:47:09 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-03-29 22:47:09 +0000 |
| commit | 84adb9036e99bc2e7560135694197b9312faa9e6 (patch) | |
| tree | dfdc79ddfc972f2167c67ff96af51fbec5a7518c /perl-install | |
| parent | 094971eecb7a5df84b325de8c6ae46e88fc1f0ea (diff) | |
| download | drakx-84adb9036e99bc2e7560135694197b9312faa9e6.tar drakx-84adb9036e99bc2e7560135694197b9312faa9e6.tar.gz drakx-84adb9036e99bc2e7560135694197b9312faa9e6.tar.bz2 drakx-84adb9036e99bc2e7560135694197b9312faa9e6.tar.xz drakx-84adb9036e99bc2e7560135694197b9312faa9e6.zip | |
support more than one boot kernel :-)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Makefile | 13 | ||||
| -rw-r--r-- | perl-install/modules.pm | 8 |
2 files changed, 8 insertions, 13 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 9b016160f..6bf08fa15 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -89,7 +89,7 @@ ifeq (sparc,$(ARCH)) ln -s /usr/X11R6/lib/X11/xkb/xkbcomp $(DEST)/usr/bin/xkbcomp endif ifeq (i386,$(ARCH)) - install -s ../kernel/cardmgr/cardmgr $(DEST)/usr/bin + install -s ../all.kernels/cardmgr/* $(DEST)/usr/bin install -s ../tools/i386/mkreiserfs $(DEST)/usr/bin endif @@ -134,16 +134,7 @@ endif cd share ; cp -a themes $(DEST)/usr/share/gtk cd share ; cp compssUsers compssUsers.desktop rpmsrate $(ROOTDEST)/Mandrake/base - if [ -f ../modules/modules.cz* ]; then \ - cp -f ../modules/modules.cz* $(DEST)/lib/; \ - if [ -f ../modules64/modules.cz* ]; then \ - cp -f ../modules64/modules.cz* $(DEST)/lib/modules64.cz2; \ - fi \ - else \ - cp -f ../modules/modules.cpio.bz2 $(DEST)/lib/; \ - install -d $(DEST)/lib/modules; \ - cp -f ../modules/pristine/* $(DEST)/lib/modules ||: ; \ - fi + for i in ../all.modules/modules.cz*; do cp -f $$i $(DEST)/lib/; done # echo -e '#!/bin/sh\n\nexec "/usr/bin/sh"' > $(DEST)/usr/bin/runinstall2 # chmod a+x $(DEST)/usr/bin/runinstall2 diff --git a/perl-install/modules.pm b/perl-install/modules.pm index df5592fbc..b2aa1ae58 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -525,7 +525,11 @@ sub unload { sub load_raw { my @l = map { my ($i, @i) = @$_; [ $i, \@i ] } grep { $_->[0] !~ /ignore/ } @_; - my $cz = "/lib/modules" . (arch() eq 'sparc64' && "64") . ".cz"; -e $cz or $cz .= "2"; + my $cz = "/lib/modules" . (arch() eq 'sparc64' && "64") . ".cz" . c::kernel_version(); + if (!-e $cz) { + unlink $_ foreach glob_("/lib/modules*.cz*"); + install_any::getAndSaveFile("Mandrake/mdkinst$cz", $cz) or die "failed to get modules $cz: $!"; + } eval { require packdrake; my $packer = new packdrake($cz); @@ -728,7 +732,7 @@ sub configure_pcmcia { }; #- run cardmgr in foreground while it is configuring the card. - run_program::run("cardmgr", "-f", "-m" ,"/modules"); + run_program::run("cardmgr" . c::kernel_version(), "-f", "-m" ,"/modules"); sleep(3); #- make sure to be aware of loaded module by cardmgr. |