From 244dddd0ada79388a27f33e73b173764c581fca1 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 19 Aug 2019 13:15:40 +0000 Subject: Add stage 4 hook support --- src/include-local/initctl.h | 1 + src/init/s6-linux-init-maker.c | 1 + src/misc/s6-linux-init-umountall.c | 76 +++++++++++++++------------------- src/shutdown/s6-linux-init-shutdownd.c | 6 +++ 4 files changed, 42 insertions(+), 42 deletions(-) (limited to 'src') diff --git a/src/include-local/initctl.h b/src/include-local/initctl.h index 507aefe..9c67b06 100644 --- a/src/include-local/initctl.h +++ b/src/include-local/initctl.h @@ -30,5 +30,6 @@ #define ENVSTAGE1 "env" #define STAGE2 "rc.init" #define STAGE3 "rc.shutdown" +#define STAGE4 "rc.shutdown.final" #endif diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c index 8de17fe..139926c 100644 --- a/src/init/s6-linux-init-maker.c +++ b/src/init/s6-linux-init-maker.c @@ -554,6 +554,7 @@ static inline void make_scripts (char const *base) copy_script(base, "runlevel") ; copy_script(base, STAGE2) ; copy_script(base, STAGE3) ; + copy_script(base, STAGE4) ; } static inline void make_bins (char const *base) diff --git a/src/misc/s6-linux-init-umountall.c b/src/misc/s6-linux-init-umountall.c index 24b22fc..93b0966 100644 --- a/src/misc/s6-linux-init-umountall.c +++ b/src/misc/s6-linux-init-umountall.c @@ -1,70 +1,62 @@ /* ISC license. */ +#include #include +#include +#include #include -#include -#include #include #include -#include #include -#define BUFSIZE 4096 -#define MAXLINES 512 +#define MAXLINES 99 + +#define EXCLUDEN 3 +static char const *exclude_type[EXCLUDEN] = { "devtmpfs", "proc", "sysfs" } ; int main (int argc, char const *const *argv) { - stralloc mountpoints[MAXLINES] ; - char buf[BUFSIZE] ; - buffer b ; + size_t mountpoints[MAXLINES] ; + unsigned int got[EXCLUDEN] = { 0, 0, 0 } ; stralloc sa = STRALLOC_ZERO ; unsigned int line = 0 ; + FILE *fp ; int e = 0 ; - int r ; - int fd ; PROG = "s6-linux-init-umountall" ; - - /* - We need to go through /proc/mounts *in reverse order*, because later mounts - may depend on earlier mounts. - The getmntent() family of functions has obviously not been designed for that - use case at all, and it is actually more difficult to use it than to do the - /proc/mounts parsing by hand. So, we do it by hand with skalibs functions. - That's how you can tell a good API from a terrible one. - */ - - fd = open_readb("/proc/mounts") ; - if (fd < 0) strerr_diefu1sys(111, "open /proc/mounts") ; - memset(mountpoints, 0, sizeof(mountpoints)) ; - buffer_init(&b, &buffer_read, fd, buf, BUFSIZE) ; + fp = setmntent("/proc/mounts", "r") ; + if (!fp) strerr_diefu1sys(111, "open /proc/mounts") ; for (;;) { - size_t n, p ; - if (line >= MAXLINES) strerr_dief1x(111, "/proc/mounts too big") ; - sa.len = 0 ; - r = skagetln(&b, &sa, '\n') ; - if (r <= 0) break ; - p = byte_chr(sa.s, sa.len, ' ') ; - if (p >= sa.len) strerr_dief1x(111, "bad /proc/mounts format") ; - p++ ; - n = byte_chr(sa.s + p, sa.len - p, ' ') ; - if (n == sa.len - p) strerr_dief1x(111, "bad /proc/mounts format") ; - if (!stralloc_catb(&mountpoints[line], sa.s + p, n) || !stralloc_0(&mountpoints[line])) - strerr_diefu1sys(111, "store mount point") ; - line++ ; + struct mntent *p ; + unsigned int i = 0 ; + errno = 0 ; + p = getmntent(fp) ; + if (!p) break ; + for (; i < EXCLUDEN ; i++) + if (!strcmp(p->mnt_type, exclude_type[i])) + { + got[i]++ ; + break ; + } + if (i < EXCLUDEN && got[i] == 1) continue ; + if (line >= MAXLINES) + strerr_dief1x(100, "too many mount points") ; + mountpoints[line++] = sa.len ; + if (!stralloc_cats(&sa, p->mnt_dir) || !stralloc_0(&sa)) + strerr_diefu1sys(111, "add mount point to list") ; } - fd_close(fd) ; - stralloc_free(&sa) ; - if (r < 0) strerr_diefu1sys(111, "read /proc/mounts") ; + if (errno) strerr_diefu1sys(111, "read /proc/mounts") ; + endmntent(fp) ; while (line--) - if (umount(mountpoints[line].s) == -1) + if (umount(sa.s + mountpoints[line]) == -1) { e++ ; - strerr_warnwu2sys("umount ", mountpoints[line].s) ; + strerr_warnwu2sys("umount ", sa.s + mountpoints[line]) ; } + stralloc_free(&sa) ; return e ; } diff --git a/src/shutdown/s6-linux-init-shutdownd.c b/src/shutdown/s6-linux-init-shutdownd.c index f988955..9707ade 100644 --- a/src/shutdown/s6-linux-init-shutdownd.c +++ b/src/shutdown/s6-linux-init-shutdownd.c @@ -143,6 +143,7 @@ static inline void prepare_stage4 (char const *basedir, char what) buffer b ; int fd ; char buf[512] ; + size_t sabase = satmp.len ; unlink_void(STAGE4_FILE ".new") ; fd = open_excl(STAGE4_FILE ".new") ; if (fd == -1) strerr_diefu3sys(111, "open ", STAGE4_FILE ".new", " for writing") ; @@ -152,10 +153,15 @@ static inline void prepare_stage4 (char const *basedir, char what) "#!" EXECLINE_SHEBANGPREFIX "execlineb -P\n\n" EXECLINE_EXTBINPREFIX "foreground { " S6_LINUX_INIT_BINPREFIX "s6-linux-init-umountall }\n" + EXECLINE_EXTBINPREFIX "foreground { ") < 0 + || !string_quote(&satmp, basedir, strlen(basedir)) + || buffer_put(&b, satmp.s + sabase, satmp.len - sabase) < 0 + || buffer_puts(&b, "/scripts/" STAGE4 " }\n" S6_LINUX_INIT_BINPREFIX "s6-linux-init-hpr -f -") < 0 || buffer_put(&b, &what, 1) < 0 || buffer_putsflush(&b, "\n") < 0) strerr_diefu2sys(111, "write to ", STAGE4_FILE ".new") ; + satmp.len = sabase ; if (fchmod(fd, S_IRWXU) == -1) strerr_diefu2sys(111, "fchmod ", STAGE4_FILE ".new") ; fd_close(fd) ; -- cgit v1.2.3