diff options
Diffstat (limited to 'sys-apps/util-linux/files/util-linux-swapon-check-symlinks.patch')
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-swapon-check-symlinks.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/sys-apps/util-linux/files/util-linux-swapon-check-symlinks.patch b/sys-apps/util-linux/files/util-linux-swapon-check-symlinks.patch new file mode 100644 index 000000000000..9b14886963ab --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-swapon-check-symlinks.patch @@ -0,0 +1,37 @@ +--- util-linux-2.12b/mount/swapon.c.orig 2004-10-28 10:02:44.320023600 -0400 ++++ util-linux-2.12b/mount/swapon.c 2004-10-28 10:02:14.384574000 -0400 +@@ -22,6 +22,7 @@ + #include <errno.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <sys/param.h> + #include "swap_constants.h" + #include "swapargs.h" + #include "nls.h" +@@ -143,10 +144,26 @@ + static int + is_in_proc_swaps(char *fname) { + int i; ++ struct stat fstatbuf; + + for (i = 0; i < numSwaps; i++) + if (!strcmp(fname, swapFiles[i])) + return 1; ++ ++ /* fallback: ++ * if the device in /etc/fstab is a symlink, the entry ++ * in /proc/swaps won't match because the kernel stores ++ * absolute pathnames. Here we compare dev_t's. ++ */ ++ if (!lstat(fname, &fstatbuf)) ++ if (S_ISLNK(fstatbuf.st_mode)) { ++ struct stat swapstatbuf; ++ for (i = 0; i < numSwaps; i++) ++ if (!stat(swapFiles[i], &swapstatbuf) && \ ++ swapstatbuf.st_dev == fstatbuf.st_dev) ++ return 1; ++ } ++ + return 0; + } + |