summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-30 10:38:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-30 10:38:27 +0000
commit494e23ae70b9bf8742dc5633f30850f32d085f0a (patch)
treefa3df5585b1f5ec6ce4990814d3effe369538c36
parentf4e4bda93831c0aeebdba1213bc2f682f80da12c (diff)
downloaddrakx-494e23ae70b9bf8742dc5633f30850f32d085f0a.tar
drakx-494e23ae70b9bf8742dc5633f30850f32d085f0a.tar.gz
drakx-494e23ae70b9bf8742dc5633f30850f32d085f0a.tar.bz2
drakx-494e23ae70b9bf8742dc5633f30850f32d085f0a.tar.xz
drakx-494e23ae70b9bf8742dc5633f30850f32d085f0a.zip
use xxx.bmp.parameters to generate boot.msg
-rwxr-xr-xmake_boot_img13
1 files changed, 2 insertions, 11 deletions
diff --git a/make_boot_img b/make_boot_img
index 108cd37f7..f8f4a2a0b 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -664,15 +664,6 @@ rescue-net: boots the rescue image from a network server
}
-sub bmp_to_msg {
- my ($bmp, $msg, $progress_place, $progress_color, $clear_color) = @_;
- #- change here for newer picture isolinux-graphic.bmp and newer parameters.
- #- 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.
- -e $bmp and _ "lilo-bmp2mdk mode:0x103 progress:$progress_place,64+$progress_color clear:600,800,64+$clear_color pos:0,0 <$bmp >$msg"
-}
-
sub isolinux {
my ($main, @kernels) = @_;
@kernels = ($main, grep { $_ ne $main } @kernels);
@@ -686,7 +677,7 @@ sub isolinux {
_ "mv images/all.rdz-$_ isolinux/alt$::i/all.rdz";
} @kernels;
- bmp_to_msg('isolinux-graphic.bmp', 'isolinux/boot.msg', '397,190,14,6', 18, 18);
+ _ "lilo-bmp2mdk file:isolinux-graphic.bmp >isolinux/boot.msg";
_ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin";
_ "install -m 644 -D /boot/memtest* isolinux/test/memtest.bin";
@@ -726,7 +717,7 @@ sub isolinux_move {
initrd($tmp_mnt_initrd, 'all', '', "move/isolinux/all.rdz-$main", '-with-busybox');
rename "move/isolinux/all.rdz-$main", "move/isolinux/all.rdz";
- bmp_to_msg('move/data/isolinux-graphic.bmp', 'move/isolinux/boot.msg', '371,144,4,4', 11, 127);
+ _ "lilo-bmp2mdk file:move/data/isolinux-graphic.bmp >move/isolinux/boot.msg";
_ "cp /usr/lib/syslinux/isolinux.bin move/isolinux/isolinux.bin";
}