[systemd-commits] src/shared

[Zbigniew Jędrzejewski-Szmek]

 src/shared/dev-setup.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 696fee7d95194948f7f6a17eab93213b925a846d
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Jun 10 08:50:59 2013 -0400

    dev-setup: do not create a dangling /proc/kcore symlink
    
    https://bugs.freedesktop.org/show_bug.cgi?id=65382
    https://bugs.gentoo.org/472060?id=472060

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index b0ac02d..50a187f 100644
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -54,13 +54,19 @@ void dev_setup(const char *prefix) {
         const char *j, *k;
 
         static const char symlinks[] =
-                "/proc/kcore\0"      "/dev/core\0"
+                "-/proc/kcore\0"     "/dev/core\0"
                 "/proc/self/fd\0"    "/dev/fd\0"
                 "/proc/self/fd/0\0"  "/dev/stdin\0"
                 "/proc/self/fd/1\0"  "/dev/stdout\0"
                 "/proc/self/fd/2\0"  "/dev/stderr\0";
 
         NULSTR_FOREACH_PAIR(j, k, symlinks) {
+                if (j[0] == '-') {
+                        j++;
+
+                        if (access(j, F_OK))
+                                continue;
+                }
 
                 if (prefix) {
                         char *linkname;