diff --git a/killproc-2.18.dif b/killproc-2.18.dif index a06edcf..02b8658 100644 --- a/killproc-2.18.dif +++ b/killproc-2.18.dif @@ -10,7 +10,7 @@ if (list_empty(&remember)) { /* No process found with pid file */ if (pid_forced) --- 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) join(&save, &mounts); } @@ -26,8 +26,8 @@ + continue; + if (nlen < m->nlen) + continue; -+ if (m->nlen > 1 && path[m->nlen] != '\0' && path[m->nlen] != '/') -+ continue; ++ if (m->nlen == 1) /* root fs is the last entry */ ++ return m; + if (strncmp(path, m->point, m->nlen)) + continue; + return m; @@ -45,8 +45,8 @@ + MNTINFO *m = list_entry(ptr, MNTINFO); + if (nlen < m->nlen) + continue; -+ if (m->nlen > 1 && path[m->nlen] != '\0' && path[m->nlen] != '/') -+ continue; ++ if (m->nlen == 1) /* root fs is the last entry */ ++ return (m == s); + if (strncmp(path, m->point, m->nlen)) + continue; + return (m == s);