From 3a11dabcbabc4012138cd21f9d2273037aae74ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= Date: Thu, 30 Oct 2003 09:05:02 +0000 Subject: =?UTF-8?q?Enable=20PCMCIA=20on=20AMD64.=20Add=20new=20boot=20scre?= =?UTF-8?q?ens=20from=20H=C3=A9l=C3=A8ne=20that=20Francois=20packaged.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- make_boot_img | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2bbe88e06..0d2240bc5 100644 --- a/Makefile +++ b/Makefile @@ -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/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/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/boot.msg"; + } } _ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin"; output "isolinux/isolinux.cfg", " -- cgit v1.2.1