* Display "not using swap partition" only in live-cd mode.

[grml-autoconfig.git] / autoconfig.functions

diff --git a/autoconfig.functions b/autoconfig.functions
index ab9d833..5307d54 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -964,7 +964,9 @@ if [ -n "$partitions" ]; then
   case "$f" in swap)
    eindent
    if [ -n "$NOSWAP" ]; then
-    ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}. (Force usage via boot option 'swap', or execute grml-swapon)" ; eend 0
+      if [ -z "$INSTALLED" ] ; then
+        ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}. (Force usage via boot option 'swap', or execute grml-swapon)" ; eend 0
+      fi
    else
      case "$(dd if=$p bs=1 count=6 skip=4086 2>/dev/null)" in
              S1SUSP|S2SUSP|pmdisk|[zZ]*)
@@ -1917,7 +1919,7 @@ config_swraid(){
 
        if ! checkbootparam 'swraid' ; then 
           eindent
-          einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using swraid bootoption for autostart."
+          einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using 'swraid' as bootoption for autostart."
           eoutdent
        else
           einfo "Bootoption swraid found. Searching for software RAID arrays:"