Merge remote branch 'boyarsh/centaurus' into kdesktop

branding.spec

@@ -38,7 +38,7 @@ Distro-specific packages with design and texts
 
 %package bootloader
 Group: System/Configuration/Boot and Init
-Summary: Graphical boot logo for lilo and syslinux
+Summary: Graphical boot logo for grub2, lilo and syslinux
 License: GPL
 
 PreReq: coreutils
@@ -46,6 +46,9 @@ Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design
 
 Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
 
+%define grub_normal white/black
+%define grub_high black/white
+
 %description bootloader
 Here you find the graphical boot logo. Suitable for both lilo and syslinux.
 
@@ -284,6 +287,7 @@ install slideshow/*  %buildroot/usr/share/install2/slideshow/
 
 #bootloader
 %pre bootloader
+[ -s /usr/share/gfxboot/%theme ] && rm -fr  /usr/share/gfxboot/%theme ||:
 [ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
 
 %post bootloader
@@ -293,7 +297,9 @@ lang=$(echo $LANG | cut -d. -f 1)
 cd boot/splash/%theme/
 echo $lang > lang
 [ "$lang" = "C" ] || echo lang | cpio -o --append -F message
-
+. shell-config
+shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal
+shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
 
 
 %preun bootloader

components.mk

@@ -29,12 +29,12 @@ boot:
 	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-install/
 	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-boot/
 	for size in 1024x768 800x600 640x480; do \
-		convert images/boot.png -resize "$$size!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -draw 'gravity SouthEast rotate -90 text -300,5 "$(STATUS)"' boot-$$size.jpg ;\
+		convert images/boot.jpg -quality 97 -resize "$$size!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' boot-$$size.jpg ;\
 		cp -al boot-$$size.jpg components/bootsplash/images/silent-$$size.jpg ;\
 		convert -resize "$$size!" images/console.jpg components/bootsplash/images/bootsplash-$$size.jpg;\
 	done
 	cp -al boot-800x600.jpg design-bootloader-source/data-boot/back.jpg
-	cp -al boot-800x600.jpg design-bootloader-source/data-install/back.jpg
+	convert images/boot.png -resize "800x600!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' design-bootloader-source/data-install/back.jpg
 #bootsplash
 	mkdir -p $(sysconfdir)/bootsplash/themes/$(THEME)
 	cp -a components/bootsplash/* $(sysconfdir)/bootsplash/themes/$(THEME)