summaryrefslogtreecommitdiffstats
path: root/make_boot_img
diff options
context:
space:
mode:
Diffstat (limited to 'make_boot_img')
-rwxr-xr-xmake_boot_img9
1 files changed, 7 insertions, 2 deletions
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", "