new images for 9.0V1_3_11_1mdk

cp lilo message in make-boot-splash script

11 files changed, 51 insertions, 27 deletions

diff --git a/README b/README
index a5660fd..98a7f8f 100644
--- a/README
+++ b/README
@@ -48,4 +48,21 @@ for more information about this).
 
 Some stuff here has been inspired from what SuSe does (kudos to Suse).
 
-Chmouel Boudjnah <chmouel@mandrakesoft.com>
+LILO boot images
+================
+
+Lilo boot image are generated with the bmp2mdk script that can be found
+in Mandrake Linux lilo package.
+
+The command to generate the message file looks like:
+
+./bmp2mdk mode:0x101 timer:63+280,80+358,64+83,64+119 entry:63+144,80+70,64+84,64+119,9,42 clear:480,640,64+119 pos:63,80 progress:0x15e,0x97,0xa,0xe < installboot82-eus.bmp > boot.msg
+
+or
+
+./bmp2mdk mode:0x101 clear:480,640,64+119 pos:63,80 progress:0x15e,0x97,0x0a,0x0e,64+59 < installboot82-eus.bmp > boot.msg
+
+the +119 value must be adapted to the given color palette for the picture used.
+
+
+Chmouel Boudjnah <chmouel@mandrakesoft.com> - Warly <warly@mandrakesoft.com>
diff --git a/bootsplash.spec b/bootsplash.spec
index 4d484c1..92a88ff 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -1,5 +1,5 @@
 %define name bootsplash
-%define version 1.3.10
+%define version 1.3.11
 %define release 1mdk
 %define _bootdir /boot
 
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 
 %changelog
+* Wed Jul 17 2002 Warly <warly@mandrakesoft.com> 1.3.11-1mdk
+- new images
+
 * Fri Mar 15 2002 Warly <warly@mandrakesoft.com> 1.3.10-1mdk
 - add dams shading fix
 - adjust progress bar geometry
diff --git a/scripts/make-boot-splash b/scripts/make-boot-splash
index f9bb20f..f31047e 100755
--- a/scripts/make-boot-splash
+++ b/scripts/make-boot-splash
@@ -37,6 +37,10 @@ if [[ -f $splash_dir/themes/$THEME/images/bootsplash-$resolution.jpg && -f $spla
     config=$splash_cfg/themes/$THEME/cfg/bootsplash-$resolution.cfg
 fi
 
+if [[ -f $splash_dir/themes/$THEME/lilo/message ]];then
+    cp -f $splash_dir/themes/$THEME/lilo/message /boot/message-graphic
+fi
+
 if [[ -n $image ]];then
     if [[ -z $config ]];then
 	echo "Can't find a config files for $resolution";
diff --git a/themes/Mandrake/lilo/message b/themes/Mandrake/lilo/message
index d41bf9a..a40cc07 100644
--- a/themes/Mandrake/lilo/message
+++ b/themes/Mandrake/lilo/message
diff --git a/themes/config/Mandrake/cfg/bootsplash-1024x768.cfg b/themes/config/Mandrake/cfg/bootsplash-1024x768.cfg
index 44fc1b6..17e5860 100644
--- a/themes/config/Mandrake/cfg/bootsplash-1024x768.cfg
+++ b/themes/config/Mandrake/cfg/bootsplash-1024x768.cfg
@@ -4,30 +4,30 @@
 
 # tx is the x coordinate of the text window in characters. default is 23
 # multiply width font width for coordinate in pixels.
-tx=22
+tx=27
 
 # ty is the y coordinate of the text window in characters. default is 20
-ty=18
+ty=16
 
 # tw is the width of the text window in characters. default is 80
 # NOTE: this should at least be 80 as on the standard linux text console
-tw=81
+tw=74
 
 # th is the height of the text window in characters. default is 18
 # NOTE: this should at least be 25 as on the standard linux text console
-th=17
+th=16
 
 # px is the progress bar x coordinate of its upper left corner
-px=170
+px=191
 
 # py is the progress bar y coordinate of its upper left corner
-py=590
+py=557
 
 # pw is the with of the progress bar
-pw=667
+pw=644
 
 # ph is the heigth of the progress bar
-ph=18
+ph=26
 
 # pc is the color of the progress bar
-pc=0x21459d
+pc=0x21449c
diff --git a/themes/config/Mandrake/cfg/bootsplash-1280x1024.cfg b/themes/config/Mandrake/cfg/bootsplash-1280x1024.cfg
index 1b35e04..e139594 100644
--- a/themes/config/Mandrake/cfg/bootsplash-1280x1024.cfg
+++ b/themes/config/Mandrake/cfg/bootsplash-1280x1024.cfg
@@ -4,30 +4,30 @@
 
 # tx is the x coordinate of the text window in characters. default is 24
 # multiply width font width for coordinate in pixels.
-tx=39
+tx=43
 
 # ty is the y coordinate of the text window in characters. default is 14
-ty=25
+ty=24
 
 # tw is the width of the text window in characters. default is 130
 # NOTE: this should at least be 80 as on the standard linux text console
-tw=82
+tw=73
 
 # th is the height of the text window in characters. default is 44
 # NOTE: this should at least be 25 as on the standard linux text console
-th=19
+th=16
 
 # px is the progress bar x coordinate of its upper left corner
-px=305
+px=319
 
 # py is the progress bar y coordinate of its upper left corner
-py=728
+py=683
 
 # pw is the with of the progress bar
-pw=667
+pw=643
 
 # ph is the heigth of the progress bar
-ph=20
+ph=26
 
 # pc is the color of the progress bar
-pc=0x21459d
+pc=0x21449c
diff --git a/themes/config/Mandrake/cfg/bootsplash-800x600.cfg b/themes/config/Mandrake/cfg/bootsplash-800x600.cfg
index 5cb9836..96f87f1 100644
--- a/themes/config/Mandrake/cfg/bootsplash-800x600.cfg
+++ b/themes/config/Mandrake/cfg/bootsplash-800x600.cfg
@@ -7,27 +7,27 @@
 tx=10
 
 # ty is the y coordinate of the text window in characters. default is 8
-ty=13
+ty=11
 
 # tw is the width of the text window in characters. default is 82
 # NOTE: this should at least be 80 as on the standard linux text console
 tw=80
 
 # th is the height of the text window in characters. default is 26
-# NOTE: this should at least be 25 as on the standard linux text console
+# NOTE: this should at least be 25 as on the standard linux text console - 16
 th=16
 
 # px is the progress bar x coordinate of its upper left corner
-px=74
+px=78
 
 # py is the progress bar y coordinate of its upper left corner
-py=500
+py=472
 
 # pw is the with of the progress bar
-pw=647
+pw=644
 
 # ph is the heigth of the progress bar
-ph=16
+ph=26
 
 # pc is the color of the progress bar
-pc=0x21459d
+pc=0x21449c
diff --git a/themes/data/Mandrake/images/bootsplash-1024x768.jpg b/themes/data/Mandrake/images/bootsplash-1024x768.jpg
index 15cd887..76efc89 100644
--- a/themes/data/Mandrake/images/bootsplash-1024x768.jpg
+++ b/themes/data/Mandrake/images/bootsplash-1024x768.jpg
diff --git a/themes/data/Mandrake/images/bootsplash-1280x1024.jpg b/themes/data/Mandrake/images/bootsplash-1280x1024.jpg
index e7f01f7..1c24c8f 100644
--- a/themes/data/Mandrake/images/bootsplash-1280x1024.jpg
+++ b/themes/data/Mandrake/images/bootsplash-1280x1024.jpg
diff --git a/themes/data/Mandrake/images/bootsplash-800x600.jpg b/themes/data/Mandrake/images/bootsplash-800x600.jpg
index cdf5819..537b1f4 100644
--- a/themes/data/Mandrake/images/bootsplash-800x600.jpg
+++ b/themes/data/Mandrake/images/bootsplash-800x600.jpg
diff --git a/themes/data/Mandrake/lilo/message b/themes/data/Mandrake/lilo/message
index d41bf9a..00b70ea 100644
--- a/themes/data/Mandrake/lilo/message
+++ b/themes/data/Mandrake/lilo/message