diff --git a/killproc-mntinf-optional.patch b/killproc-mntinf-optional.patch new file mode 100644 index 0000000..82a063c --- /dev/null +++ b/killproc-mntinf-optional.patch @@ -0,0 +1,18 @@ +On newer kernels there are more optional parameter fields +before the hyphen + +--- + libinit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- libinit.c ++++ libinit.c 2019-04-09 12:47:35.913748799 +0000 +@@ -281,7 +281,7 @@ static void init_mounts(void) + + if ((mnt = fopen("/proc/self/mountinfo", "re")) == (FILE*)0) + return; +- while (fscanf(mnt, "%i %i %u:%u %*s %s %*s - %s %*s %*[^\n]", &mid, &parid, &maj, &min, &point[0], &fstype[0]) == 6) { ++ while (fscanf(mnt, "%i %i %u:%u %*s %s %*[^-] - %s %*s %*[^\n]", &mid, &parid, &maj, &min, &point[0], &fstype[0]) == 6) { + const size_t nlen = strlen(point); + MNTINFO *restrict p; + if (posix_memalign((void*)&p, sizeof(void*), alignof(MNTINFO)+(nlen+1)) != 0) { diff --git a/sysvinit.changes b/sysvinit.changes index b68d4fa..691d317 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 9 13:13:42 UTC 2019 - Dr. Werner Fink + +- Add patch killproc-mntinf-optional.patch to handle various optional + fields of /proc//mountinfo on the entry/ies before the hypen + (bsc#1131982) + ------------------------------------------------------------------- Mon Aug 6 13:21:20 UTC 2018 - werner@suse.de diff --git a/sysvinit.spec b/sysvinit.spec index 7ea47eb..b19a7a8 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -39,6 +39,7 @@ Patch9: %{name}-%{SIVER}-no-kill.patch Patch30: killproc-%{KPVER}.dif Patch31: killproc-2.18-open_flags.dif Patch32: killproc-sysmacros.patch +Patch33: killproc-mntinf-optional.patch Patch50: startpar-%{START}.dif Patch51: startpar-sysmacros.patch @@ -74,6 +75,7 @@ pushd ../killproc-%{KPVER} %patch30 %patch31 -p0 -b .dialog %patch32 -p1 +%patch33 -p0 ln -t../%{name}-%{SIVER}/doc/killproc README popd pushd ../startpar-%{START}