[readonly/geninitrd: 535/1068] - optional features like suspend and flash conflicts aren't fatal. #70

[draenog]

commit 9f1cb7c24510f8a4e5620027ad88161898162889
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Nov 19 18:07:05 2007 +0000

    - optional features like suspend and flash conflicts aren't fatal. #70
    
    svn-id: @9071

 geninitrd | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index 2ccba3e..708263a 100755
--- a/geninitrd
+++ b/geninitrd
@@ -1141,7 +1141,8 @@ initrd_gen_bootsplash() {
 	debug "Generating bootsplash"
 
 	if [ "$INITRDFS" != "initramfs" ]; then
-		die "Using bootsplash requires INITRDFS=initramfs!"
+		warn "Using bootsplash requires INITRDFS=initramfs; skipping bootsplash generation"
+		return
 	fi
 
 	if [ ! -x /bin/splash.bin ]; then
@@ -1178,7 +1179,8 @@ initrd_gen_fbsplash() {
 	debug "Generating fbsplash"
 
 	if [ "$INITRDFS" != "initramfs" ]; then
-		die "Using fbsplash requires INITRDFS=initramfs!"
+		warn "Using fbsplash requires INITRDFS=initramfs; skipping fbsplash generation"
+		return
 	fi
 
 	if [ ! -x /usr/bin/splash_geninitramfs ]; then
@@ -1715,11 +1717,15 @@ if [ ! -d "/lib/modules/$kernel" ]; then
 fi
 
 if is_yes "$USE_SUSPEND" && is_yes "$USE_TUXONICE"; then
-	die "Tuxonice shouldn't be used in parallel with mainline suspend!"
+	warn "Tuxonice can't be used in parallel with mainline suspend! Disabling both inclustion to initrd"
+	USE_SUSPEND=no
+	USE_TUXONICE=no
 fi
 
 if is_yes "$FB_SPLASH"  && is_yes "$BOOT_SPLASH"; then
-	die "You can't use both bootsplash and fbsplash! Please choose one."
+	warn "You can't use bootsplash and fbsplash together! Disabling both inclusion to initrd"
+	FB_SPLASH=no
+	BOOT_SPLASH=no
 fi
 
 if [ ! -f /proc/mounts ]; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/147754ca159d40ca5eb541074dc043d8cbd92090