From 5f7780597e9b878458824fb8d93f0a9e62935ed1 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 8 Oct 2012 20:01:30 +0200
Subject: Simplifying bootparameter assembling in defaults.

---
 functions/defaults.sh | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'functions')

diff --git a/functions/defaults.sh b/functions/defaults.sh
index b8c4d67fc..3a43071be 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -969,27 +969,16 @@ Set_defaults ()
 	case "${LB_INITRAMFS}" in
 		live-boot)
 			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=live config quiet splash}"
-			;;
-
-		casper)
-			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=casper quiet splash}"
-			;;
-
-		none)
-			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-quiet splash}"
-			;;
-	esac
-
-	case "${LB_INITRAMFS}" in
-		live-boot)
 			LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
 			;;
 
 		casper)
+			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=casper quiet splash}"
 			LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=casper memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
 			;;
 
 		none)
+			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-quiet splash}"
 			LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
 			;;
 	esac
-- 
cgit v1.2.3