pool/sysvinit
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optional seventh and more fields before the hyphen in mountinfo

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=231
This commit is contained in:
Dr. Werner Fink 2019-04-09 13:17:18 +00:00 committed by Git OBS Bridge
parent 9aee5f6010
commit f2a00e7e81
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
killproc-mntinf-optional.patch Normal file
View File

@ -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) {

2
powerd.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #

6
sysvinit.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 9 13:13:42 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Add patch killproc-mntinf-optional.patch to handle various optional
fields of /proc/<pid>/mountinfo on the entry/ies before the hypen
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 6 13:21:20 UTC 2018 - werner@suse.de Mon Aug 6 13:21:20 UTC 2018 - werner@suse.de

4
sysvinit.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
@ -39,6 +39,7 @@ Patch9: %{name}-%{SIVER}-no-kill.patch
Patch30: killproc-%{KPVER}.dif Patch30: killproc-%{KPVER}.dif
Patch31: killproc-2.18-open_flags.dif Patch31: killproc-2.18-open_flags.dif
Patch32: killproc-sysmacros.patch Patch32: killproc-sysmacros.patch
Patch33: killproc-mntinf-optional.patch
Patch50: startpar-%{START}.dif Patch50: startpar-%{START}.dif
Patch51: startpar-sysmacros.patch Patch51: startpar-sysmacros.patch
@ -74,6 +75,7 @@ pushd ../killproc-%{KPVER}
%patch30 %patch30
%patch31 -p0 -b .dialog %patch31 -p0 -b .dialog
%patch32 -p1 %patch32 -p1
%patch33 -p0
ln -t../%{name}-%{SIVER}/doc/killproc README ln -t../%{name}-%{SIVER}/doc/killproc README
popd popd
pushd ../startpar-%{START} pushd ../startpar-%{START}