[Demudi-commits] r794 - bootsplash/trunk/debian

[Free Ekanayaka]

Author: free-guest
Date: 2006-05-31 11:14:10 +0000 (Wed, 31 May 2006)
New Revision: 794

Modified:
   bootsplash/trunk/debian/bootsplash.config
   bootsplash/trunk/debian/bootsplash.templates
   bootsplash/trunk/debian/changelog
   bootsplash/trunk/debian/control
   bootsplash/trunk/debian/postinst
   bootsplash/trunk/debian/rules
Log:
* Add support for automatic grub setup
* Lowered debconf priority of all questions to medium
* Do not start init script on install or upgrades
* Depends on grub, support for other bootloaders
  might be added later

Modified: bootsplash/trunk/debian/bootsplash.config
===================================================================
--- bootsplash/trunk/debian/bootsplash.config	2006-05-29 09:11:31 UTC (rev 793)
+++ bootsplash/trunk/debian/bootsplash.config	2006-05-31 11:14:10 UTC (rev 794)
@@ -5,9 +5,11 @@
 
 THEME_SYMLINK="/etc/bootsplash/themes/current"
 
-# get and save the current theme, ignore errors
+# get and save the current theme and resolution, ignore errors
 db_get shared/bootsplash-theme || true
 OLD_DEFAULT="$RET"
+db_get $OLD_DEFAULT/resolutions
+OLD_RES="$RET"
 
 # get the owners and the choices for this option
 db_metaget shared/bootsplash-theme owners
@@ -39,10 +41,10 @@
    rm -f $THEME_SYMLINK || true
 fi
 
-db_input high bootsplash/bootloader-info || true
+db_input medium bootsplash/bootloader || true
 db_go
 
-db_input high bootsplash/initramfs || true
+db_input medium bootsplash/initramfs || true
 db_go
 
 exit 0

Modified: bootsplash/trunk/debian/bootsplash.templates
===================================================================
--- bootsplash/trunk/debian/bootsplash.templates	2006-05-29 09:11:31 UTC (rev 793)
+++ bootsplash/trunk/debian/bootsplash.templates	2006-05-31 11:14:10 UTC (rev 794)
@@ -1,13 +1,14 @@
-Template: bootsplash/bootloader-info
-Type: note
-_Description: You need to configure your bootloader
+Template: bootsplash/bootloader
+Type: boolean
+_Description: Automatically configure your bootloader?
  In order to complete the bootsplash installation you need to
- configure your bootloader. See /usr/share/doc/bootsplash/README.Debian
+ configure your bootloader. If you wish this package can
+ automatically modify the appropriate configuration files.
 
 Template: bootsplash/initramfs
 Type: boolean
 Default: true
 _Description: Update your initramfs images?
  To let the Linux kernel find your bootsplash them at boot you need
- to update your initramfs images. Do you want this package to automatically
+ to update your initramfs images. If you with this package to automatically
  run the appropriate script.

Modified: bootsplash/trunk/debian/changelog
===================================================================
--- bootsplash/trunk/debian/changelog	2006-05-29 09:11:31 UTC (rev 793)
+++ bootsplash/trunk/debian/changelog	2006-05-31 11:14:10 UTC (rev 794)
@@ -1,3 +1,13 @@
+bootsplash (3.1-14) UNRELEASED; urgency=low
+
+  * Add support for automatic grub setup
+  * Lowered debconf priority of all questions to medium
+  * Do not start init script on install or upgrades
+  * Depends on grub, support for other bootloaders
+    might be added later
+
+ -- Free Ekanayaka <freee at debian.org>  Wed, 31 May 2006 11:02:52 +0200
+
 bootsplash (3.1-13) unstable; urgency=low
 
   [ Free Ekanayaka ]

Modified: bootsplash/trunk/debian/control
===================================================================
--- bootsplash/trunk/debian/control	2006-05-29 09:11:31 UTC (rev 793)
+++ bootsplash/trunk/debian/control	2006-05-31 11:14:10 UTC (rev 794)
@@ -8,7 +8,7 @@
 
 Package: bootsplash
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, bootsplash-theme-debian | bootsplash-theme, initramfs-tools
+Depends: ${shlibs:Depends}, ${misc:Depends}, bootsplash-theme-debian | bootsplash-theme, initramfs-tools, grub
 Recommends: sysv-rc-bootsplash
 Suggests: kernel-patch-bootsplash (>= 3.0.0)
 Conflicts: bootsplash-theme-debiantux

Modified: bootsplash/trunk/debian/postinst
===================================================================
--- bootsplash/trunk/debian/postinst	2006-05-29 09:11:31 UTC (rev 793)
+++ bootsplash/trunk/debian/postinst	2006-05-31 11:14:10 UTC (rev 794)
@@ -27,6 +27,8 @@
 #     installation fails and the `postinst' is called with `abort-upgrade',
 #     `abort-remove' or `abort-deconfigure'.
 
+GRUB_MENU=/boot/grub/menu.lst
+
 case "$1" in
     configure)
 
@@ -52,6 +54,25 @@
 	    update-initramfs -u
 	fi
 
+	# update bootloader
+	db_get bootsplash/bootloader
+	if [ "$RET" = "true" ] && [ -e $GRUB_MENU ]; then
+	    case $NEW_RES in
+		"640x480") VGA_RES=785 ;;
+		"800x600") VGA_RES=788 ;;
+		"1024x768") VGA_RES=791 ;;
+		"1152x864") VGA_RES=355 ;;
+		"1280x1024") VGA_RES=794 ;;
+		"1600x1200") VGA_RES=798 ;;
+		*) VGA_RES=791 ;;
+	    esac
+	    KOPT=$(grep -e "^# kopt" /boot/grub/menu.lst | \
+		sed -e 's/vga=[[:digit:]]\{3\}[[[:blank:]]\?//g'| \
+		sed -e 's/silent=[[:digit:]]\{3\}[[[:blank:]]\?//g')
+	    KOPT="$KOPT vga=$VGA_RES splash=silent"
+	    sed -i -e "s|^# kopt=.*|$KOPT|g" $GRUB_MENU
+	    update-grub
+	fi
     fi
     ;;
 

Modified: bootsplash/trunk/debian/rules
===================================================================
--- bootsplash/trunk/debian/rules	2006-05-29 09:11:31 UTC (rev 793)
+++ bootsplash/trunk/debian/rules	2006-05-31 11:14:10 UTC (rev 794)
@@ -88,7 +88,7 @@
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
-	dh_installinit -u"defaults 00"
+	dh_installinit -u"defaults 00" --no-start
 #	dh_installcron
 #	dh_installinfo
 	cp debian/bootsplash-default "$(CURDIR)/debian/bootsplash/etc/default/bootsplash"