Disabling default usage of local swap partitions. Can be enabled with the 'swapon...

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index ec5f6e8..ba325a4 100755 (executable)
--- 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 ()