* Extend 'Ignoring swap partition'-message for new default

    behaviour (do not use swap by default anymore).

diff --git a/autoconfig.functions b/autoconfig.functions
index 723d9b2..8305199 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Fre Nov 24 21:24:22 CET 2006 [mika]
+# Latest change: Mon Nov 27 21:02:23 CET 2006 [mika]

 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh


@@ -964,7 +964,7 @@ 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} as requested." ; eend 0
+    ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}. (Force usage via boot option 'swap', or execute grml-swapon)" ; eend 0

    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 6750a98..34e6a1c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.6-3) unstable; urgency=low
+
+  * Extend 'Ignoring swap partition'-message for new default
+    behaviour (do not use swap by default anymore).
+
+ -- Michael Prokop <mika@grml.org>  Mon, 27 Nov 2006 23:45:30 +0100
+

 grml-autoconfig (0.6-2) unstable; urgency=low
 
   * Use 'MDADM_MAILADDR__' for setting mailaddress in mdadm.conf.
 grml-autoconfig (0.6-2) unstable; urgency=low
 
   * Use 'MDADM_MAILADDR__' for setting mailaddress in mdadm.conf.