From: LaMont Jones <lamont@debian.org>
Date: Sat, 22 Mar 2008 19:22:24 +0000 (-0600)
Subject: Merge branch 'stable/v2.13'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85080336bd680c10b129be129286c3d9cd082bd9;p=util-linux

Merge branch 'stable/v2.13'
---

85080336bd680c10b129be129286c3d9cd082bd9
diff --cc mount/swapon.c
index 33d2b135,e97f8354..23c92e44
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@@ -18,11 -18,10 +18,13 @@@
  #include "nls.h"
  #include "fsprobe.h"
  #include "realpath.h"
 -#include "mount_paths.h"
 +#include "pathnames.h"
 +#include "sundries.h"
 +
 +#define PATH_MKSWAP	"/sbin/mkswap"
  
+ #define PATH_MKSWAP	"/sbin/mkswap"
+ 
  #ifdef HAVE_SYS_SWAP_H
  # include <sys/swap.h>
  #endif