diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2000-09-11 10:56:54 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2000-09-11 10:56:54 +0000 |
commit | 66acc9ca3c2c03404de8a2cb635d67f474e91e0a (patch) | |
tree | 031a2d66652d5f9c2d674cf96d5896ccd3a7a5bd /make_boot_img | |
parent | f5d31de24627657212675867a36831d208148043 (diff) | |
download | drakx-66acc9ca3c2c03404de8a2cb635d67f474e91e0a.tar drakx-66acc9ca3c2c03404de8a2cb635d67f474e91e0a.tar.gz drakx-66acc9ca3c2c03404de8a2cb635d67f474e91e0a.tar.bz2 drakx-66acc9ca3c2c03404de8a2cb635d67f474e91e0a.tar.xz drakx-66acc9ca3c2c03404de8a2cb635d67f474e91e0a.zip |
no_comment
Diffstat (limited to 'make_boot_img')
-rwxr-xr-x | make_boot_img | 10 |
1 files changed, 7 insertions, 3 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/"; |