diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-10-30 09:05:02 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-10-30 09:05:02 +0000 |
| commit | 3a11dabcbabc4012138cd21f9d2273037aae74ac (patch) | |
| tree | dc7968b99521c2477a4d09e76806e0d1e7937290 | |
| parent | e96126ca54a0fbd53ca88456cdf08128b304cff4 (diff) | |
| download | drakx-3a11dabcbabc4012138cd21f9d2273037aae74ac.tar drakx-3a11dabcbabc4012138cd21f9d2273037aae74ac.tar.gz drakx-3a11dabcbabc4012138cd21f9d2273037aae74ac.tar.bz2 drakx-3a11dabcbabc4012138cd21f9d2273037aae74ac.tar.xz drakx-3a11dabcbabc4012138cd21f9d2273037aae74ac.zip | |
Enable PCMCIA on AMD64. Add new boot screens from Hélène that Francois
packaged.
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | make_boot_img | 9 |
2 files changed, 8 insertions, 3 deletions
@@ -20,7 +20,7 @@ ifeq (ia64,$(ARCH)) BOOT_IMG = all.img endif ifeq (x86_64,$(ARCH)) - BOOT_IMG = cdrom.img hd.img hdcdrom_usb.img network.img network_gigabit.img network_usb.img blank.img + BOOT_IMG = cdrom.img hd.img hdcdrom_usb.img network.img network_gigabit.img network_usb.img blank.img pcmcia.img endif FBOOT_IMG = $(BOOT_IMG:%=images/%) diff --git a/make_boot_img b/make_boot_img index 4df3d2c45..820f69c81 100755 --- a/make_boot_img +++ b/make_boot_img @@ -122,7 +122,7 @@ sub initrd { _ "$sudo mknod $mnt/dev/ttyp0 c 3 0"; } - if (member($type, qw(pcmcia all network)) && $arch !~ /ppc|ia64|x86_64/) { + if (member($type, qw(pcmcia all network)) && $arch !~ /ppc|ia64/) { _ "$sudo cp -a /etc/pcmcia $mnt/etc"; _ "cp $mnt/etc/pcmcia/config /tmp/pcmcia_config_tmp"; _ "tools/patch_pcmcia_config.pl /tmp/pcmcia_config_tmp kernel/all.modules/$main/modules.dep"; @@ -637,7 +637,12 @@ sub isolinux { #- for old style pictures (9.1 and previous) # lilo-bmp2mdk mode:0x103 progress:425,173,16,7,64+21 clear:600,800,64+59 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg #- for current 9.2 pictures. - _ "lilo-bmp2mdk mode:0x103 progress:371,144,4,8,64+60 clear:600,800,64+127 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg"; + if ($arch eq "x86_64") { + _ "bunzip2 -c $instdir/init-data/boot-install-lilo-800-V64.msg.bz2 >isolinux/boot.msg"; + } + else { + _ "lilo-bmp2mdk mode:0x103 progress:371,144,4,8,64+60 clear:600,800,64+127 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg"; + } } _ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin"; output "isolinux/isolinux.cfg", " |