aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rw-r--r--bootsplash.spec7
-rwxr-xr-xscripts/make-boot-splash5
-rw-r--r--themes/Mandrake/cfg/bootsplash-1024x768.cfg16
-rw-r--r--themes/Mandrake/cfg/bootsplash-800x600.cfg12
-rw-r--r--themes/Mandrake/images/bootsplash-1024x768.jpgbin40860 -> 37664 bytes
-rw-r--r--themes/Mandrake/images/bootsplash-1280x1024.jpgbin49891 -> 163440 bytes
-rw-r--r--themes/Mandrake/images/bootsplash-800x600.jpgbin35904 -> 29759 bytes
-rw-r--r--themes/config/Ayo/cfg/bootsplash-1024x768.cfg20
-rw-r--r--themes/config/Ayo/cfg/bootsplash-1280x1024.cfg19
-rw-r--r--themes/config/Ayo/cfg/bootsplash-800x600.cfg19
-rw-r--r--themes/config/Ayo/global.config5
-rw-r--r--themes/config/Mandrake/cfg/bootsplash-1024x768.cfg33
-rw-r--r--themes/config/Mandrake/cfg/bootsplash-1280x1024.cfg33
-rw-r--r--themes/config/Mandrake/cfg/bootsplash-800x600.cfg33
-rw-r--r--themes/data/Ayo/images/bootsplash-1024x768.jpgbin0 -> 81971 bytes
-rw-r--r--themes/data/Ayo/images/bootsplash-1280x1024.jpgbin0 -> 26183 bytes
-rw-r--r--themes/data/Ayo/images/bootsplash-800x600.jpgbin0 -> 13683 bytes
-rw-r--r--themes/data/Ayo/lilo/messagebin0 -> 139684 bytes
-rw-r--r--themes/data/Mandrake/images/bootsplash-1024x768.jpgbin0 -> 37664 bytes
-rw-r--r--themes/data/Mandrake/images/bootsplash-1280x1024.jpgbin0 -> 163440 bytes
-rw-r--r--themes/data/Mandrake/images/bootsplash-800x600.jpgbin0 -> 29759 bytes
-rw-r--r--themes/data/Mandrake/lilo/messagebin0 -> 46856 bytes
23 files changed, 192 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index e59b09a..ed1a3b0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,12 @@ RELEASE := $(shell sed -n 's/%define release //p' < $(NAME).spec)
RELTAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
SUBDIRS=scripts fb
-DATADIRS=themes
+DATADIRS=themes/data/
+CONFIGDIRS=themes/config/
prefix=/
sharedir=/usr/share
+configdir=/etc
all: check
@@ -15,9 +17,11 @@ check:
@for i in $(SUBDIRS);do make -C $$i check;done
install:
- @mkdir -p $(prefix)$(sharedir)/bootsplash/
+ @mkdir -p $(prefix)$(sharedir)/bootsplash/themes/
+ @mkdir -p $(prefix)$(configdir)/bootsplash/themes/
@for i in $(SUBDIRS);do make -C $$i install;done
- @for i in $(DATADIRS);do cp -a $$i $(prefix)$(sharedir)/bootsplash/;done
+ @for i in $(DATADIRS);do cp -a $$i/* $(prefix)$(sharedir)/bootsplash/themes/;done
+ @for i in $(CONFIGDIRS);do cp -a $$i/* $(prefix)$(configdir)/bootsplash/themes/;done
dis: clean
rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
diff --git a/bootsplash.spec b/bootsplash.spec
index 3d33fbf..9a0cda4 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -1,5 +1,5 @@
%define name bootsplash
-%define version 1.3.4
+%define version 1.3.5
%define release 1mdk
Summary: The Boot Splash Images and scripts.
@@ -47,9 +47,14 @@ rm -rf $RPM_BUILD_ROOT
%doc README ChangeLog
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%_datadir/%{name}/*
+%_sysconfdir/%{name}/*
/bin/*
%changelog
+* Fri Mar 01 2002 Warly <warly@mandrakesoft.com> 1.3.5-1mdk
+- move cfg in /etc to have progress bar in rc.sysinit
+- add new ln images
+- configure progress bar location
* Tue Feb 26 2002 Warly <warly@mandrakesoft.com> 1.3.4-1mdk
- add new fb tools fbresolution and progress
diff --git a/scripts/make-boot-splash b/scripts/make-boot-splash
index bdbeca7..f9bb20f 100755
--- a/scripts/make-boot-splash
+++ b/scripts/make-boot-splash
@@ -6,6 +6,7 @@
# $Id$
: ${splash_dir=/usr/share/bootsplash}
+: ${splash_cfg=/etc/bootsplash}
[[ -f /etc/sysconfig/bootsplash ]] && source /etc/sysconfig/bootsplash
[[ -z $THEME ]] && THEME=Mandrake
@@ -31,9 +32,9 @@ elif [[ $vgamode == 1280* ]];then
resolution=1280x1024
fi
-if [[ -f $splash_dir/themes/$THEME/images/bootsplash-$resolution.jpg && -f $splash_dir/themes/$THEME/cfg/bootsplash-$resolution.cfg ]];then
+if [[ -f $splash_dir/themes/$THEME/images/bootsplash-$resolution.jpg && -f $splash_cfg/themes/$THEME/cfg/bootsplash-$resolution.cfg ]];then
image=$splash_dir/themes/$THEME/images/bootsplash-$resolution.jpg
- config=$splash_dir/themes/$THEME/cfg/bootsplash-$resolution.cfg
+ config=$splash_cfg/themes/$THEME/cfg/bootsplash-$resolution.cfg
fi
if [[ -n $image ]];then
diff --git a/themes/Mandrake/cfg/bootsplash-1024x768.cfg b/themes/Mandrake/cfg/bootsplash-1024x768.cfg
index c75bf71..90e0e14 100644
--- a/themes/Mandrake/cfg/bootsplash-1024x768.cfg
+++ b/themes/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=23
+tx=22
# ty is the y coordinate of the text window in characters. default is 20
-ty=20
+ty=18
# 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=80
+tw=81
# 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=18
+th=17
# px is the progress bar x coordinate of its upper left corner
-px=190
+px=168
# py is the progress bar y coordinate of its upper left corner
-py=280
+py=589
# pw is the with of the progress bar
-pw=630
+pw=665
# ph is the heigth of the progress bar
-ph=20
+ph=18
# pc is the color of the progress bar
pc=0x21459d
diff --git a/themes/Mandrake/cfg/bootsplash-800x600.cfg b/themes/Mandrake/cfg/bootsplash-800x600.cfg
index 82b4d46..5dc9cfb 100644
--- a/themes/Mandrake/cfg/bootsplash-800x600.cfg
+++ b/themes/Mandrake/cfg/bootsplash-800x600.cfg
@@ -7,7 +7,7 @@
tx=10
# ty is the y coordinate of the text window in characters. default is 8
-ty=15
+ty=13
# 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
@@ -15,19 +15,19 @@ 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
-th=18
+th=16
# px is the progress bar x coordinate of its upper left corner
-px=85
+px=75
# py is the progress bar y coordinate of its upper left corner
-py=200
+py=500
# pw is the with of the progress bar
-pw=630
+pw=643
# ph is the heigth of the progress bar
-ph=20
+ph=15
# pc is the color of the progress bar
pc=0x21459d
diff --git a/themes/Mandrake/images/bootsplash-1024x768.jpg b/themes/Mandrake/images/bootsplash-1024x768.jpg
index 9adb850..307100a 100644
--- a/themes/Mandrake/images/bootsplash-1024x768.jpg
+++ b/themes/Mandrake/images/bootsplash-1024x768.jpg
Binary files differ
diff --git a/themes/Mandrake/images/bootsplash-1280x1024.jpg b/themes/Mandrake/images/bootsplash-1280x1024.jpg
index dcbf345..f80fdfd 100644
--- a/themes/Mandrake/images/bootsplash-1280x1024.jpg
+++ b/themes/Mandrake/images/bootsplash-1280x1024.jpg
Binary files differ
diff --git a/themes/Mandrake/images/bootsplash-800x600.jpg b/themes/Mandrake/images/bootsplash-800x600.jpg
index 3360f17..4f057ae 100644
--- a/themes/Mandrake/images/bootsplash-800x600.jpg
+++ b/themes/Mandrake/images/bootsplash-800x600.jpg
Binary files differ
diff --git a/themes/config/Ayo/cfg/bootsplash-1024x768.cfg b/themes/config/Ayo/cfg/bootsplash-1024x768.cfg
new file mode 100644
index 0000000..2405746
--- /dev/null
+++ b/themes/config/Ayo/cfg/bootsplash-1024x768.cfg
@@ -0,0 +1,20 @@
+# This is the configuration file for the 1024x768 bootsplash picture
+# This file is necessary to specify the coordinates of the text box on the
+# splash screen.
+#
+# Comments are welcome by stepan@suse.de
+
+# tx is the x coordinate of the text window in characters. default is 19
+# multiply width font width for coordinate in pixels.
+tx=7
+
+# ty is the y coordinate of the text window in characters. default is 10
+ty=4
+
+# tw is the width of the text window in characters. default is 104
+# NOTE: this should at least be 80 as on the standard linux text console
+tw=122
+
+# th is the height of the text window in characters. default is 34
+# NOTE: this should at least be 25 as on the standard linux text console
+th=41
diff --git a/themes/config/Ayo/cfg/bootsplash-1280x1024.cfg b/themes/config/Ayo/cfg/bootsplash-1280x1024.cfg
new file mode 100644
index 0000000..6b3c031
--- /dev/null
+++ b/themes/config/Ayo/cfg/bootsplash-1280x1024.cfg
@@ -0,0 +1,19 @@
+# This is the configuration file for the 1280x1024 bootsplash picture
+# This file is necessary to specify the coordinates of the text box on the
+# splash screen.
+
+# tx is the x coordinate of the text window in characters. default is 24
+# multiply width font width for coordinate in pixels.
+tx=9
+
+# ty is the y coordinate of the text window in characters. default is 14
+ty=6
+
+# 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=145
+
+# 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=53
+
diff --git a/themes/config/Ayo/cfg/bootsplash-800x600.cfg b/themes/config/Ayo/cfg/bootsplash-800x600.cfg
new file mode 100644
index 0000000..8f6b024
--- /dev/null
+++ b/themes/config/Ayo/cfg/bootsplash-800x600.cfg
@@ -0,0 +1,19 @@
+# This is the configuration file for the 800x600 bootsplash picture.
+# This file is necessary to specify the coordinates of the text box on the
+# splash screen.
+
+# tx is the x coordinate of the text window in characters. default is 15
+# multiply width font width for coordinate in pixels.
+tx=7
+
+# ty is the y coordinate of the text window in characters. default is 8
+ty=4
+
+# 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=82
+
+# 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
+th=30
+
diff --git a/themes/config/Ayo/global.config b/themes/config/Ayo/global.config
new file mode 100644
index 0000000..4efccc5
--- /dev/null
+++ b/themes/config/Ayo/global.config
@@ -0,0 +1,5 @@
+# See definitions on /etc/sysconfig/bootsplash
+LOGO_CONSOLE=yes
+
+# Quiet or not ?
+QUIET=no
diff --git a/themes/config/Mandrake/cfg/bootsplash-1024x768.cfg b/themes/config/Mandrake/cfg/bootsplash-1024x768.cfg
new file mode 100644
index 0000000..90e0e14
--- /dev/null
+++ b/themes/config/Mandrake/cfg/bootsplash-1024x768.cfg
@@ -0,0 +1,33 @@
+# This is the configuration file for the 1024x768 bootsplash picture.
+# This file is necessary to specify the coordinates of the text box on the
+# splash screen.
+
+# tx is the x coordinate of the text window in characters. default is 23
+# multiply width font width for coordinate in pixels.
+tx=22
+
+# ty is the y coordinate of the text window in characters. default is 20
+ty=18
+
+# 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
+
+# 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
+
+# px is the progress bar x coordinate of its upper left corner
+px=168
+
+# py is the progress bar y coordinate of its upper left corner
+py=589
+
+# pw is the with of the progress bar
+pw=665
+
+# ph is the heigth of the progress bar
+ph=18
+
+# pc is the color of the progress bar
+pc=0x21459d
diff --git a/themes/config/Mandrake/cfg/bootsplash-1280x1024.cfg b/themes/config/Mandrake/cfg/bootsplash-1280x1024.cfg
new file mode 100644
index 0000000..ee8ffa2
--- /dev/null
+++ b/themes/config/Mandrake/cfg/bootsplash-1280x1024.cfg
@@ -0,0 +1,33 @@
+# This is the configuration file for the 1280x1024 bootsplash picture
+# This file is necessary to specify the coordinates of the text box on the
+# splash screen.
+
+# tx is the x coordinate of the text window in characters. default is 24
+# multiply width font width for coordinate in pixels.
+tx=39
+
+# ty is the y coordinate of the text window in characters. default is 14
+ty=28
+
+# 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
+
+# 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=20
+
+# px is the progress bar x coordinate of its upper left corner
+px=190
+
+# py is the progress bar y coordinate of its upper left corner
+py=280
+
+# pw is the with of the progress bar
+pw=630
+
+# ph is the heigth of the progress bar
+ph=20
+
+# pc is the color of the progress bar
+pc=0x21459d
diff --git a/themes/config/Mandrake/cfg/bootsplash-800x600.cfg b/themes/config/Mandrake/cfg/bootsplash-800x600.cfg
new file mode 100644
index 0000000..5dc9cfb
--- /dev/null
+++ b/themes/config/Mandrake/cfg/bootsplash-800x600.cfg
@@ -0,0 +1,33 @@
+# This is the configuration file for the 800x600 bootsplash picture.
+# This file is necessary to specify the coordinates of the text box on the
+# splash screen.
+
+# tx is the x coordinate of the text window in characters. default is 15
+# multiply width font width for coordinate in pixels.
+tx=10
+
+# ty is the y coordinate of the text window in characters. default is 8
+ty=13
+
+# 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
+th=16
+
+# px is the progress bar x coordinate of its upper left corner
+px=75
+
+# py is the progress bar y coordinate of its upper left corner
+py=500
+
+# pw is the with of the progress bar
+pw=643
+
+# ph is the heigth of the progress bar
+ph=15
+
+# pc is the color of the progress bar
+pc=0x21459d
diff --git a/themes/data/Ayo/images/bootsplash-1024x768.jpg b/themes/data/Ayo/images/bootsplash-1024x768.jpg
new file mode 100644
index 0000000..589be5b
--- /dev/null
+++ b/themes/data/Ayo/images/bootsplash-1024x768.jpg
Binary files differ
diff --git a/themes/data/Ayo/images/bootsplash-1280x1024.jpg b/themes/data/Ayo/images/bootsplash-1280x1024.jpg
new file mode 100644
index 0000000..aba3e9b
--- /dev/null
+++ b/themes/data/Ayo/images/bootsplash-1280x1024.jpg
Binary files differ
diff --git a/themes/data/Ayo/images/bootsplash-800x600.jpg b/themes/data/Ayo/images/bootsplash-800x600.jpg
new file mode 100644
index 0000000..1d1a64c
--- /dev/null
+++ b/themes/data/Ayo/images/bootsplash-800x600.jpg
Binary files differ
diff --git a/themes/data/Ayo/lilo/message b/themes/data/Ayo/lilo/message
new file mode 100644
index 0000000..9be93bc
--- /dev/null
+++ b/themes/data/Ayo/lilo/message
Binary files differ
diff --git a/themes/data/Mandrake/images/bootsplash-1024x768.jpg b/themes/data/Mandrake/images/bootsplash-1024x768.jpg
new file mode 100644
index 0000000..307100a
--- /dev/null
+++ b/themes/data/Mandrake/images/bootsplash-1024x768.jpg
Binary files differ
diff --git a/themes/data/Mandrake/images/bootsplash-1280x1024.jpg b/themes/data/Mandrake/images/bootsplash-1280x1024.jpg
new file mode 100644
index 0000000..f80fdfd
--- /dev/null
+++ b/themes/data/Mandrake/images/bootsplash-1280x1024.jpg
Binary files differ
diff --git a/themes/data/Mandrake/images/bootsplash-800x600.jpg b/themes/data/Mandrake/images/bootsplash-800x600.jpg
new file mode 100644
index 0000000..4f057ae
--- /dev/null
+++ b/themes/data/Mandrake/images/bootsplash-800x600.jpg
Binary files differ
diff --git a/themes/data/Mandrake/lilo/message b/themes/data/Mandrake/lilo/message
new file mode 100644
index 0000000..d41bf9a
--- /dev/null
+++ b/themes/data/Mandrake/lilo/message
Binary files differ