diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-30 23:04:58 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-30 23:04:58 +0000 |
| commit | ebf869beb1dddfd7213dc28831879597ab378f5c (patch) | |
| tree | 283c2d770989e6d18c82041e516da47c23705441 | |
| parent | 4e6634208509f5c67b4d5ad449db696b8e4b6c3d (diff) | |
| download | s6-linux-init-ebf869beb1dddfd7213dc28831879597ab378f5c.tar.xz | |
With the correct deps.mak
| -rw-r--r-- | package/deps.mak | 2 | ||||
| -rw-r--r-- | src/misc/s6-linux-init-umountall.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/package/deps.mak b/package/deps.mak index 1a4f5a7..2c32a6e 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -10,7 +10,7 @@ src/init/s6-linux-init.o src/init/s6-linux-init.lo: src/init/s6-linux-init.c src src/lib/s6_linux_init_logouthook.o src/lib/s6_linux_init_logouthook.lo: src/lib/s6_linux_init_logouthook.c src/include-local/initctl.h src/include/s6-linux-init/s6-linux-init.h src/misc/s6-linux-init-echo.o src/misc/s6-linux-init-echo.lo: src/misc/s6-linux-init-echo.c src/misc/s6-linux-init-logouthookd.o src/misc/s6-linux-init-logouthookd.lo: src/misc/s6-linux-init-logouthookd.c -src/misc/s6-linux-init-umountall.o src/misc/s6-linux-init-umountall.lo: src/misc/s6-linux-init-umountall.c +src/misc/s6-linux-init-umountall.o src/misc/s6-linux-init-umountall.lo: src/misc/s6-linux-init-umountall.c src/include/s6-linux-init/config.h src/shutdown/hpr_shutdown.o src/shutdown/hpr_shutdown.lo: src/shutdown/hpr_shutdown.c src/shutdown/hpr.h src/shutdown/hpr_wall.o src/shutdown/hpr_wall.lo: src/shutdown/hpr_wall.c src/shutdown/hpr.h src/shutdown/s6-linux-init-hpr.o src/shutdown/s6-linux-init-hpr.lo: src/shutdown/s6-linux-init-hpr.c src/include-local/defaults.h src/shutdown/hpr.h diff --git a/src/misc/s6-linux-init-umountall.c b/src/misc/s6-linux-init-umountall.c index cb5f7d5..42fae15 100644 --- a/src/misc/s6-linux-init-umountall.c +++ b/src/misc/s6-linux-init-umountall.c @@ -35,15 +35,14 @@ int main (int argc, char const *const *argv) errno = 0 ; p = getmntent(fp) ; if (!p) break ; + if (!strcmp(p->mnt_dir, S6_LINUX_INIT_TMPFS)) continue ; for (; i < EXCLUDEN ; i++) if (!strcmp(p->mnt_type, exclude_type[i])) { got[i]++ ; break ; } - if ((i < EXCLUDEN && got[i] == 1) - || !strcmp(p->mnt_dir, S6_LINUX_INIT_TMPFS)) - continue ; + if (i < EXCLUDEN && got[i] == 1) continue ; if (line >= MAXLINES) strerr_dief1x(100, "too many mount points") ; mountpoints[line++] = sa.len ; |