Re: swapon/swapoff

[Alfred M. Szmidt]

   Please clean up your patch to remove all the nonsense hunks.

Sure, but how do I get those "nonsense" hunks applied if I don't send
a patch with them?

(fixed my ChangeLog entry just a bit too)

2005-02-05  Alfred M. Szmidt  <ams@gnu.org>

        * swapon.c (main): Just print a warning if we couldn't find
        any swap partitions in _PATH_MNTTAB instead of exiting with a
        non-zero exit status.

        * swapon.c (require_signature) [SWAPOFF]: Initialise to 0.
        (ignore_signature) [SWAPOFF]: Initialise to 1.
        
        (require_signature) [!SWAPOFF]: Initialise to 1.
        (ignore_signature) [!SWAPOFF]: Initialise to 0.

Index: sutils/swapon.c
===================================================================
RCS file: /cvsroot/hurd/hurd/sutils/swapon.c,v
retrieving revision 1.9
diff -u -r1.9 swapon.c
--- sutils/swapon.c     26 Jun 2002 18:19:07 -0000      1.9
+++ sutils/swapon.c     5 Feb 2005 16:55:28 -0000
@@ -35,11 +35,17 @@
 
 #ifdef SWAPOFF
 const char *argp_program_version = STANDARD_HURD_VERSION (swapoff);
+
+static int require_signature = 0;
+static int ignore_signature = 1;
 #else
 const char *argp_program_version = STANDARD_HURD_VERSION (swapon);
+
+static int require_signature = 1;
+static int ignore_signature = 0;
 #endif
 
-static int ignore_signature, require_signature, quiet;
+static int quiet;
 
 static struct argp_option options[] =
 {
@@ -508,7 +514,8 @@
                err |= swaponoff (me->mnt_fsname, ONOFF);
              }
          if (done == 0)
-           error (2, 0, "No swap partitions found in %s", _PATH_MNTTAB);
+           error (0, 0, "warning: no swap partitions found in %s",
+                  _PATH_MNTTAB);
          else if (err)
            return 1;
        }