2016-01-25 16:47:02 +01:00
|
|
|
---
|
|
|
|
|
Makefile | 6 ++----
|
|
|
|
|
libinit.c | 4 ++--
|
|
|
|
|
startproc.c | 4 ++--
|
|
|
|
|
3 files changed, 6 insertions(+), 8 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- Makefile
|
|
|
|
|
+++ Makefile 2016-01-25 15:42:08.730864821 +0000
|
|
|
|
|
@@ -15,10 +15,8 @@ DESTDIR =
|
|
|
|
|
VERSION = 2.21
|
|
|
|
|
DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]')
|
|
|
|
|
|
|
|
|
|
-ifneq ($(INC),)
|
|
|
|
|
- LIBS += -lblogger
|
|
|
|
|
- COPTS += -DUSE_BLOGD
|
|
|
|
|
-endif
|
|
|
|
|
+ LIBS += -lblogger -lpthread
|
|
|
|
|
+ COPTS += -DUSE_BLOGD
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Architecture
|
2012-05-23 13:13:51 +02:00
|
|
|
--- libinit.c
|
2016-01-25 16:47:02 +01:00
|
|
|
+++ libinit.c 2012-05-23 11:04:58.000000000 +0000
|
2012-05-23 13:13:51 +02:00
|
|
|
@@ -265,7 +265,7 @@ static inline boolean isnetfs(const char
|
|
|
|
|
static void init_mounts(void)
|
|
|
|
|
{
|
|
|
|
|
char point[PATH_MAX+1];
|
|
|
|
|
- char fstype[126];
|
|
|
|
|
+ char fstype[257];
|
|
|
|
|
struct stat st;
|
|
|
|
|
int mid, parid, max = 0;
|
|
|
|
|
uint maj, min;
|
|
|
|
|
@@ -280,7 +280,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 %*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) {
|
2012-08-10 14:53:49 +02:00
|
|
|
--- startproc.c
|
2016-01-25 16:47:02 +01:00
|
|
|
+++ startproc.c 2014-05-27 12:08:10.000000000 +0000
|
2012-08-10 14:53:49 +02:00
|
|
|
@@ -778,7 +778,7 @@ retry:
|
|
|
|
|
* to see a process damage.
|
|
|
|
|
*/
|
|
|
|
|
usleep(10*1000); /* 10 ms time for the child and its child */
|
|
|
|
|
- if (++n < 10)
|
|
|
|
|
+ if (++n < 50)
|
|
|
|
|
goto retry;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
