Dr. Werner Fink 2011-02-09 08:13:34 +00:00 committed by Git OBS Bridge
parent 49b2556678
commit ad02e06e7a

View File

@ -10,7 +10,7 @@
if (list_empty(&remember)) { /* No process found with pid file */ if (list_empty(&remember)) { /* No process found with pid file */
if (pid_forced) if (pid_forced)
--- libinit.c --- libinit.c
+++ libinit.c 2011-02-08 18:30:50.260425424 +0000 +++ libinit.c 2011-02-09 08:12:47.703926223 +0000
@@ -314,9 +314,42 @@ static void init_mounts(void) @@ -314,9 +314,42 @@ static void init_mounts(void)
join(&save, &mounts); join(&save, &mounts);
} }
@ -26,8 +26,8 @@
+ continue; + continue;
+ if (nlen < m->nlen) + if (nlen < m->nlen)
+ continue; + continue;
+ if (m->nlen > 1 && path[m->nlen] != '\0' && path[m->nlen] != '/') + if (m->nlen == 1) /* root fs is the last entry */
+ continue; + return m;
+ if (strncmp(path, m->point, m->nlen)) + if (strncmp(path, m->point, m->nlen))
+ continue; + continue;
+ return m; + return m;
@ -45,8 +45,8 @@
+ MNTINFO *m = list_entry(ptr, MNTINFO); + MNTINFO *m = list_entry(ptr, MNTINFO);
+ if (nlen < m->nlen) + if (nlen < m->nlen)
+ continue; + continue;
+ if (m->nlen > 1 && path[m->nlen] != '\0' && path[m->nlen] != '/') + if (m->nlen == 1) /* root fs is the last entry */
+ continue; + return (m == s);
+ if (strncmp(path, m->point, m->nlen)) + if (strncmp(path, m->point, m->nlen))
+ continue; + continue;
+ return (m == s); + return (m == s);