From c535eabfd26a1927fc87adb9250e277e19a66c3c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 29 Jun 2004 04:54:42 +0000 Subject: - add scripts/remove-boot-splash so we can modify a bootsplash from an initrd without having to rebuild it - make-boot-splash doesn't try to detect the resolution anymore, it now needs to be given one - in switch-themes and remove-theme, use bootloader-config to update the bootloader - remove detect-resolution - requires new mkinitrd (old mkinitrd used detect-resolution) - remove "Patch: glibc-fixed-header.tar.bz2" which is unused (and not in CVS) --- scripts/make-boot-splash | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'scripts/make-boot-splash') diff --git a/scripts/make-boot-splash b/scripts/make-boot-splash index ea22423..8cd83e8 100755 --- a/scripts/make-boot-splash +++ b/scripts/make-boot-splash @@ -11,19 +11,11 @@ [[ -f /etc/sysconfig/bootsplash ]] && source /etc/sysconfig/bootsplash [[ -z $THEME ]] && THEME=Mandrake -initrd_file=$1 - -[[ -z $initrd_file ]] && { - echo "You need to specify a initrd file as argument" - exit 1; -} +[ $# = 2 ] || { echo "usage: $0 "; exit 1; } +initrd_file=$1 vgamode=$2 -if [[ -z $vgamode || $vgamode == auto ]];then - vgamode=$( $splash_dir/scripts/detect-resolution $initrd_file) -fi - if [[ $vgamode == 640* ]];then resolution=640x480 elif [[ $vgamode == 800* ]];then @@ -34,6 +26,10 @@ elif [[ $vgamode == 1280* ]];then resolution=1280x1024 elif [[ $vgamode == 1600* ]];then resolution=1600x1200 +else + echo "unknown resolution \"$vgamode\"" + [ "$vgamode" = "auto" ] && echo 'resolution "auto" is not handled anymore' + exit 1 fi if [[ -f $splash_cfg/themes/$THEME/config/bootsplash-$resolution.cfg ]];then @@ -49,6 +45,8 @@ if [[ -z $config ]];then exit 1; fi +$splash_dir/scripts/remove-splash $initrd_file + if [[ -x /sbin/splash ]]; then /sbin/splash -s -f $config >> $initrd_file fi -- cgit v1.2.1