SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Mon Nov 19 19:07:05 2007
New Revision: 9071

Modified:
   geninitrd/trunk/geninitrd
Log:
- optional features like suspend and flash conflicts aren't fatal. #70

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Mon Nov 19 19:07:05 2007
@@ -1141,7 +1141,8 @@
 	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 @@
 	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 @@
 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