diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-04-28 13:23:24 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-04-28 13:23:24 +0000 |
| commit | e433e4088f0990009f9bb78757ad145317ba91ec (patch) | |
| tree | 1826a8245d24c40f8cd5049bdae5fd1a167f8f58 | |
| parent | 13aa9bd172ec10cd8d3ddae6c7159dbe9bf91535 (diff) | |
| download | s6-linux-init-e433e4088f0990009f9bb78757ad145317ba91ec.tar.xz | |
Adjust s6-ipcserver options in created scripts
| -rw-r--r-- | src/init/s6-linux-init-maker.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c index 0dc8310..13f1a7f 100644 --- a/src/init/s6-linux-init-maker.c +++ b/src/init/s6-linux-init-maker.c @@ -145,7 +145,7 @@ static int logouthookd_script (buffer *b, char const *data) (void)data ; return put_shebang(b) && buffer_puts(b, - S6_EXTBINPREFIX "s6-ipcserver -1 -l0 -- " LOGOUTHOOKD_SOCKET "\n" + S6_EXTBINPREFIX "s6-ipcserver -1 -a 0700 -c 1000 -C 1000 -- " LOGOUTHOOKD_SOCKET "\n" S6_LINUX_INIT_BINPREFIX "s6-linux-init-logouthookd\n") >= 0 ; } @@ -176,9 +176,7 @@ static int runleveld_script (buffer *b, char const *data) || buffer_puts(b, EXECLINE_EXTBINPREFIX "fdmove -c 2 1\n" EXECLINE_EXTBINPREFIX "fdmove 1 3\n" - S6_EXTBINPREFIX "s6-ipcserver-socketbinder -- " RUNLEVELD_SOCKET "\n" - S6_EXTBINPREFIX "s6-ipcserverd -1 -c1 --\n" - S6_EXTBINPREFIX "s6-ipcserver-access -v0 -E -l0 -i data/rules --\n" + S6_EXTBINPREFIX "s6-ipcserver -1 -a 0700 -c 1 -- " RUNLEVELD_SOCKET "\n" S6_EXTBINPREFIX "s6-sudod -0 -1 -2 -t 30000 --\n") < 0 || !string_quote(&satmp, robase, strlen(robase))) return 0 ; if (buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0) goto err ; @@ -456,7 +454,7 @@ static int utmpd_script (buffer *b, char const *uw) if (buffer_puts(b, "\n" EXECLINE_EXTBINPREFIX "cd " S6_LINUX_INIT_TMPFS "/" UTMPS_DIR "\n" EXECLINE_EXTBINPREFIX "fdmove 1 3\n" - S6_EXTBINPREFIX "s6-ipcserver -1 -- ") < 0) return 0 ; + S6_EXTBINPREFIX "s6-ipcserver -1 -c 1000 -- ") < 0) return 0 ; if (buffer_puts(b, uw[0] == 'u' ? UTMPS_UTMPD_PATH : UTMPS_WTMPD_PATH) < 0 || buffer_puts(b, "\n" UTMPS_EXTBINPREFIX "utmps-") < 0 @@ -519,14 +517,6 @@ static inline void make_image (char const *base) auto_script(base, "run-image/" SCANDIR "/" SHUTDOWND_SERVICEDIR "/run", &shutdownd_script, 0) ; auto_dir(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR, 0, 0, 0755) ; - auto_dir(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/data", 0, 0, 0755) ; - auto_dir(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/data/rules", 0, 0, 0755) ; - auto_dir(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/data/rules/gid", 0, 0, 0755) ; - auto_dir(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/data/rules/gid/0", 0, 0, 0755) ; - auto_file(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/data/rules/gid/0/allow", "", 0) ; - auto_dir(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/data/rules/uid", 0, 0, 0755) ; - auto_dir(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/data/rules/uid/0", 0, 0, 0755) ; - auto_file(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/data/rules/uid/0/allow", "", 0) ; auto_file(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/notification-fd", "3\n", 2) ; auto_script(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/run", &runleveld_script, 0) ; |