Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at Mon Jan 24 16:24:02 CET 2011. -------- --- sysvinit/sysvinit.changes 2010-11-09 16:32:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-01-21 19:32:25.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 21 19:26:44 CET 2011 - werner@suse.de + +- Killproc: Do not be fooled if a device is mounted several times + +------------------------------------------------------------------- @@ -19 +24 @@ -- New killporc version 2.17 +- New killproc version 2.17 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.oEs6Nq/_old 2011-01-24 16:23:29.000000000 +0100 +++ /var/tmp/diff_new_pack.oEs6Nq/_new 2011-01-24 16:23:29.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package sysvinit (Version 2.88) +# spec file for package sysvinit # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ Group: System/Base AutoReqProv: on Version: 2.88 -Release: 23 +Release: 24 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel ++++++ killproc-2.17.dif ++++++ --- /var/tmp/diff_new_pack.oEs6Nq/_old 2011-01-24 16:23:29.000000000 +0100 +++ /var/tmp/diff_new_pack.oEs6Nq/_new 2011-01-24 16:23:29.000000000 +0100 @@ -1,6 +1,29 @@ --- libinit.c -+++ libinit.c 2010-10-27 08:17:06.371926813 +0000 -@@ -728,19 +728,21 @@ int pidof (const char * inname, const ch ++++ libinit.c 2011-01-21 18:25:49.019926024 +0000 +@@ -307,15 +307,16 @@ static void init_mounts(void) + } + } + +-static MNTINFO *find_mount(const char * path) ++static int find_mount(const char * path, MNTINFO *s) + { +- MNTINFO *m; ++ MNTINFO *m, *p = s->parent; + for (m = mounts; m; m = m->next) { +- if (strncmp(path, m->point, m->nlen)) +- continue; +- break; ++ if (s == m && strncmp(path, m->point, m->nlen) == 0) ++ return 1; ++ if (p == m && strncmp(path, p->point, p->nlen) == 0) ++ return 1; + } +- return m; ++ return 0; + } + + extern inline char * handl_buf(char *restrict buf) +@@ -728,19 +729,21 @@ int pidof (const char * inname, const ch if (!(flags & (KTHREAD|KSHORT)) && !isscrpt) { char entry[PATH_MAX+1]; char *realname = NULL; @@ -26,13 +49,13 @@ - if (prefix && find_mount(name) != prefix) - continue; -+ if (find_mount(name) != prefix) ++ if (!find_mount(name, prefix)) + continue; + } if (fstatat(dfd, here(d->d_name, "exe"), &pid_st, 0) < 0) { if (errno != EPERM && errno != EACCES) -@@ -765,12 +767,22 @@ int pidof (const char * inname, const ch +@@ -765,12 +768,22 @@ int pidof (const char * inname, const ch if (strlen(fullname) > PATH_MAX) continue; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org