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

[Free Ekanayaka]

Author: free-guest
Date: 2006-02-07 13:19:50 +0000 (Tue, 07 Feb 2006)
New Revision: 672

Modified:
   bootsplash/trunk/debian/bootsplash.config
   bootsplash/trunk/debian/changelog
Log:
* Properly handle non-interactive installs: the theme and initrd 
  debconf question might not be answered

Modified: bootsplash/trunk/debian/bootsplash.config
===================================================================
--- bootsplash/trunk/debian/bootsplash.config	2006-02-07 12:45:05 UTC (rev 671)
+++ bootsplash/trunk/debian/bootsplash.config	2006-02-07 13:19:50 UTC (rev 672)
@@ -44,12 +44,19 @@
 
 # locate initrd images and add none and custom to the list
 
-db_subst shared/bootsplash-initrd initrd-list `echo /boot/initrd* custom none | sed -e 's/ /, /g;'`
+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
-INITRD="$RET"
+if [ "$RET" != "" ]; then
+	INITRD="$RET"
+else
+	db_set shared/bootsplash-initrd $INITRD
+fi
 
 if [ "$INITRD" = "custom" ]
 then

Modified: bootsplash/trunk/debian/changelog
===================================================================
--- bootsplash/trunk/debian/changelog	2006-02-07 12:45:05 UTC (rev 671)
+++ bootsplash/trunk/debian/changelog	2006-02-07 13:19:50 UTC (rev 672)
@@ -10,7 +10,8 @@
   * Removed empty bootsplash.7 manpage
   * Added missing commands to the init.d script
   * Added watch file
-  * Properly handle non-interactive installs
+  * Properly handle non-interactive installs: the theme and initrd 
+    debconf question might not be answered
   * Use the first kernel listed in /boot as default
 
  -- Free Ekanayaka <free at agnula.org>  Mon,  6 Feb 2006 05:27:50 -0500