X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=ba325a4457c5c8105091b40a71613f706c6579d6;hb=e170719f72d4b5805f9278ed87c21497308ab1b0;hp=ec5f6e81bd636413c034c08d8d7e9f7ae0f72a31;hpb=059acaa9da49953b091d220ed52de1d252c61ae5;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index ec5f6e8..ba325a4 100755
--- a/scripts/live
+++ b/scripts/live
@@ -285,9 +285,9 @@ Arguments ()
 				export NOSUDO
 				;;
 
-			noswap)
-				NOSWAP="Yes"
-				export NOSWAP
+			swapon)
+				SWAPON="Yes"
+				export SWAPON
 				;;
 
 			noupdatenotifier)
@@ -1338,7 +1338,9 @@ set_usplash_timeout ()
 	if [ -x /sbin/usplash_write ]
 	then
 		/sbin/usplash_write "TIMEOUT 120"
-	fi
+	else if [ -x /sbin/splashy_update ] ; then
+		/sbin/splashy_update "TIMEOUT 120"
+	fi ; fi
 }
 
 mountroot ()