[Demudi-commits] r731 - in bootsplash/trunk/debian: . patches
Free Ekanayaka
free-guest at costa.debian.org
Wed Apr 19 13:22:31 UTC 2006
Author: free-guest
Date: 2006-04-19 13:22:21 +0000 (Wed, 19 Apr 2006)
New Revision: 731
Modified:
bootsplash/trunk/debian/bootsplash.config
bootsplash/trunk/debian/bootsplash.templates
bootsplash/trunk/debian/changelog
bootsplash/trunk/debian/control
bootsplash/trunk/debian/patches/initramfs.dpatch
bootsplash/trunk/debian/postinst
Log:
* Properly handle non-interactive installs: the theme and initrd
* Depend on initramfs-tools and use update-initramfs to update the
kernels which provide bootsplash support
* New maintainer address freee at debian.org
Modified: bootsplash/trunk/debian/bootsplash.config
===================================================================
--- bootsplash/trunk/debian/bootsplash.config 2006-04-19 09:32:44 UTC (rev 730)
+++ bootsplash/trunk/debian/bootsplash.config 2006-04-19 13:22:21 UTC (rev 731)
@@ -1,7 +1,5 @@
-#!/bin/bash
+#!/bin/sh -e
-set -e
-
# source debconf stuff
. /usr/share/debconf/confmodule
@@ -42,28 +40,7 @@
db_set shared/bootsplash-theme $NEW_DEFAULT
fi
-# locate initrd images and add none and custom to the list
-INITRD_LIST="$(echo /boot/initrd* custom none | sed -e 's/ /, /g;')"
-INITRD="$(echo $INITRD_LIST|cut -f 1 -d ,)" # defaults to the first
-
-db_subst shared/bootsplash-initrd initrd-list "$INITRD_LIST"
-db_input medium shared/bootsplash-initrd || true
-db_go
-
-db_get shared/bootsplash-initrd
-if [ "$RET" != "" ]; then
- INITRD="$RET"
-else
- db_set shared/bootsplash-initrd $INITRD
-fi
-
-if [ "$INITRD" = "custom" ]
-then
- db_input medium shared/bootsplash-custom-initrd || true
- db_go
-fi
-
# don't ask which resoultion if there is only one choice
db_metaget $NEW_DEFAULT/resolutions choices
Modified: bootsplash/trunk/debian/bootsplash.templates
===================================================================
--- bootsplash/trunk/debian/bootsplash.templates 2006-04-19 09:32:44 UTC (rev 730)
+++ bootsplash/trunk/debian/bootsplash.templates 2006-04-19 13:22:21 UTC (rev 731)
@@ -26,21 +26,6 @@
These display modes can also be found in the FrameBuffer HOWTO. Any 16bit
mode should work.
-Template: shared/bootsplash-initrd
-Type: select
-_Choices: ${initrd-list}
-_Description: Select an initrd image.
- If you are currently using an initrd image bootsplash can append your
- splash images to it, if not one will be created for you. Please select
- your initrd image, select none if you want bootsplash to create one,
- select custom if you do not see your image or want to manually enter the
- path.
-
-Template: shared/bootsplash-custom-initrd
-Type: string
-_Description: Enter the path to your initrd image.
- The image should be in the /boot directory but it could be anywhere.
-
Template: shared/bootsplash-bootloader
Type: select
_Choices: lilo, grub
Modified: bootsplash/trunk/debian/changelog
===================================================================
--- bootsplash/trunk/debian/changelog 2006-04-19 09:32:44 UTC (rev 730)
+++ bootsplash/trunk/debian/changelog 2006-04-19 13:22:21 UTC (rev 731)
@@ -1,4 +1,4 @@
-bootsplash (3.1-12+13pre1) UNRELEASED; urgency=low
+bootsplash (3.1-12+13pre2) UNRELEASED; urgency=low
[ Free Ekanayaka ]
* Using dpatch from now on
@@ -10,7 +10,7 @@
* Removed empty bootsplash.7 manpage
* Added missing commands to the init.d script
* Added watch file
- * Properly handle non-interactive installs: the theme and initrd
+ * Properly handle non-interactive installs: the theme and initrd
debconf question might not be answered
* Use the first kernel listed in /boot as default
* Copy the splash.sh.1 man page manually, as dh_installman doesn't
@@ -22,11 +22,11 @@
later in case somebody requests it.
* Starting from 2.6.15 Debian kernels use initramfs, updated postinst
script accordingly
- * Depend on initramfs-tools
- * Hack in postinst script to guess the right kernel version, needs to
- be polished
+ * Depend on initramfs-tools and use update-initramfs to update the
+ kernels which provide bootsplash support
+ * New maintainer address freee at debian.org
- -- Free Ekanayaka <free at agnula.org> Mon, 6 Feb 2006 05:27:50 -0500
+ -- Free Ekanayaka <freee at debian.org> Wed, 19 Apr 2006 14:19:35 +0200
bootsplash (3.1-11) unstable; urgency=low
Modified: bootsplash/trunk/debian/control
===================================================================
--- bootsplash/trunk/debian/control 2006-04-19 09:32:44 UTC (rev 730)
+++ bootsplash/trunk/debian/control 2006-04-19 13:22:21 UTC (rev 731)
@@ -1,7 +1,7 @@
Source: bootsplash
Section: graphics
Priority: optional
-Maintainer: Free Ekanayaka <free at agnula.org>
+Maintainer: Free Ekanayaka <freee at debian.org>
Uploaders: Junichi Uekawa <dancer at debian.org>
Build-Depends: debhelper (>= 4.1.16), libfreetype6-dev (>= 2.0.0), libmng-dev (>= 1.0), zlib1g-dev, dpatch
Standards-Version: 3.6.2
Modified: bootsplash/trunk/debian/patches/initramfs.dpatch
===================================================================
--- bootsplash/trunk/debian/patches/initramfs.dpatch 2006-04-19 09:32:44 UTC (rev 730)
+++ bootsplash/trunk/debian/patches/initramfs.dpatch 2006-04-19 13:22:21 UTC (rev 731)
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad bootsplash-3.1~/Scripts/initramfs bootsplash-3.1/Scripts/initramfs
---- bootsplash-3.1~/Scripts/initramfs 1969-12-31 19:00:00.000000000 -0500
-+++ bootsplash-3.1/Scripts/initramfs 2006-02-28 14:26:11.000000000 -0500
-@@ -0,0 +1,57 @@
+--- bootsplash-3.1~/Scripts/initramfs 1970-01-01 01:00:00.000000000 +0100
++++ bootsplash-3.1/Scripts/initramfs 2006-04-19 13:05:42.000000000 +0200
+@@ -0,0 +1,51 @@
+#!/bin/sh
+
+PREREQ=""
@@ -59,10 +59,4 @@
+ exit 0
+fi
+
-+echo "Installing bootsplash theme $THEME with size $SPLASH_SIZE..."
+splash -s -f $SPLASH_FILE > $DESTDIR/bootsplash
-+echo "Done."
-+
-+
-+
-+
Modified: bootsplash/trunk/debian/postinst
===================================================================
--- bootsplash/trunk/debian/postinst 2006-04-19 09:32:44 UTC (rev 730)
+++ bootsplash/trunk/debian/postinst 2006-04-19 13:22:21 UTC (rev 731)
@@ -1,12 +1,10 @@
-#! /bin/bash
+#! /bin/sh -e
# postinst script for bootsplash-theme
#
# see: dh_installdeb(1)
# update-rc.d bootsplash defaults 00 > /dev/null
-set -e
-
. /usr/share/debconf/confmodule
THEME_SYMLINK="/etc/bootsplash/themes/current"
@@ -30,7 +28,7 @@
# `abort-remove' or `abort-deconfigure'.
case "$1" in
- configure)
+ configure|install)
;;
@@ -44,69 +42,36 @@
;;
esac
-db_get shared/bootsplash-initrd
-INITRD="$RET"
-
-if [ "$INITRD" = "custom" ]
-then
- db_get shared/bootsplash-custom-initrd
- SPLASH_INITRD="$RET"
-elif [ "$INITRD" = "none" ]
-then
- SPLASH_INITRD="/boot/initrd.splash"
-else
- SPLASH_INITRD="$INITRD"
-fi
-
-if [ "$SPLASH_INITRD" = "" ]
-then
- SPLASH_INITRD="/boot/initrd.splash"
-fi
-
# if we need to change the theme the $THEME_SYMLINK will be missing
# if it is we will make it point to the new theme
-if [ ! -e "$THEME_SYMLINK" ]
-then
- db_get shared/bootsplash-theme
- NEW_THEME="$RET"
+if [ ! -e "$THEME_SYMLINK" ]; then
- # make the symlink
- # first we must extract the locatation of the theme from the theme name
- ln -s /etc/bootsplash/themes/`echo $NEW_THEME | sed -e 's/^bootsplash-theme-//g;'` $THEME_SYMLINK || get_new_theme
+ db_get shared/bootsplash-theme
- # now we need to create the initrd image
- echo "Building bootsplash initrd image..."
+ # first we must extract the locatation of the theme from the theme name
+ NEW_THEME="$(echo $RET | sed -e 's/^bootsplash-theme-//g')"
- db_get $NEW_THEME/resolutions
- RESOLUTIONS=`echo "$RET" | sed -e 's/, / /g;'`
+ # make the symlink
+ ln -s /etc/bootsplash/themes/$NEW_THEME $THEME_SYMLINK
- if [ "$SPLASH_INITRD" = "/boot/initrd.splash" ]
- then
- rm -f /boot/initrd.splash || true # remove old initrd image
- else
- # backup or restore an initrd image
- cp "$SPLASH_INITRD.orig" "$SPLASH_INITRD" || \
- cp "$SPLASH_INITRD" "$SPLASH_INITRD.orig"
- fi
+fi
- # create an initramfs with the first available resolution
- for i in $RESOLUTIONS
- do
- sed -i -e "s/^SPLASH_SIZE=.*/SPLASH_SIZE=\"$i\"/g" /etc/default/bootsplash
- mkinitramfs -o "$SPLASH_INITRD" $(echo $SPLASH_INITRD | cut -f 2- -d -)
- break
- done
+# create new initramfs images for kernel with bootsplash support enable
+for config in $(find /boot/ -mindepth 1 -maxdepth 1 -name "config-*"); do
+ if grep -q ^CONFIG_BOOTSPLASH=y $config; then
+ KVER=$(basename $config | sed -e 's/^config-//g')
+ echo -n "Found kernel $KVER with bootsplash support, updating initramfs ... "
+ if ! update-initramfs -k $KVER -u; then
+ echo "failed"
+ else
+ echo "done"
+ fi
+ fi
+done
- db_get shared/bootsplash-bootloader
- if [ "$RET" = "lilo" ]
- then
- if [ -f /sbin/lilo ]
- then
- lilo # run lilo
- fi
- fi
- echo "Using the $NEW_THEME bootsplash theme at $RESOLUTIONS resolution(s)."
-
+db_get shared/bootsplash-bootloader
+if [ "$RET" = "grub" ]; then
+ true # Implment auto configuration of menu.lst
fi
db_get shared/bootsplash-initscript
@@ -120,13 +85,7 @@
db_stop
-
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
-
-
exit 0
-
-
More information about the Demudi-commits
mailing list