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

diff --git a/autoconfig.functions b/autoconfig.functions
index 22a8e83..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
   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]*)
    else
      case "$(dd if=$p bs=1 count=6 skip=4086 2>/dev/null)" in
              S1SUSP|S2SUSP|pmdisk|[zZ]*)

diff --git a/debian/changelog b/debian/changelog
index 867569a..3ce03ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.6-6) unstable; urgency=low
+
+  * Display "not using swap partition" only in live-cd mode.
+
+ -- Michael Prokop <mika@grml.org>  Sun,  3 Dec 2006 12:47:42 +0100
+

 grml-autoconfig (0.6-5) unstable; urgency=low
 
   * Adjust swraid bootoption information text, thanks formorer
 grml-autoconfig (0.6-5) unstable; urgency=low
 
   * Adjust swraid bootoption information text, thanks formorer