diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-02-06 20:02:58 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-02-06 20:02:58 +0000 |
| commit | 39b5e12df2a6c0fce8b882a8b2f9ab296afff62c (patch) | |
| tree | 36f9cd6aba655786e504e2b633de01dad54c0f26 /sys-apps/util-linux/files | |
| parent | force wrapper for now (diff) | |
| download | gentoo-2-39b5e12df2a6c0fce8b882a8b2f9ab296afff62c.tar.gz gentoo-2-39b5e12df2a6c0fce8b882a8b2f9ab296afff62c.tar.bz2 gentoo-2-39b5e12df2a6c0fce8b882a8b2f9ab296afff62c.zip | |
Touchup the swapon patch to work properly.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'sys-apps/util-linux/files')
| -rw-r--r-- | sys-apps/util-linux/files/digest-util-linux-2.12p-r1 (renamed from sys-apps/util-linux/files/digest-util-linux-2.12p) | 0 | ||||
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12p b/sys-apps/util-linux/files/digest-util-linux-2.12p-r1 index 6fc34d2bb6e1..6fc34d2bb6e1 100644 --- a/sys-apps/util-linux/files/digest-util-linux-2.12p +++ b/sys-apps/util-linux/files/digest-util-linux-2.12p-r1 diff --git a/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch b/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch index 31d78594c06a..f421458049f1 100644 --- a/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch +++ b/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch @@ -1,10 +1,10 @@ ---- 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 +--- util-linux-2.12b/mount/swapon.c ++++ util-linux-2.12b/mount/swapon.c @@ -7,2 +7,3 @@ #include <stdlib.h> +#include <sys/param.h> #include <stdio.h> -@@ -137,10 +138,26 @@ +@@ -137,10 +138,27 @@ static int is_in_proc_swaps(const char *fname) { int i; @@ -22,6 +22,7 @@ + if (!lstat(fname, &fstatbuf)) + if (S_ISLNK(fstatbuf.st_mode)) { + struct stat swapstatbuf; ++ stat(fname, &fstatbuf); + for (i = 0; i < numSwaps; i++) + if (swapFiles[i] && !stat(swapFiles[i], &swapstatbuf) && \ + swapstatbuf.st_rdev == fstatbuf.st_rdev) |