From f7df2f7bb6abbea365cccb1345dcf1a1b7a80797 Mon Sep 17 00:00:00 2001 From: PS Date: Sat, 7 Feb 2026 10:16:45 +0100 Subject: Improve usertree shutdown; improve system .s6-svscan directory --- package/deps.mak | 24 ++++++------------------ package/modes | 11 ++--------- package/targets.mak | 24 ++++++------------------ 3 files changed, 14 insertions(+), 45 deletions(-) (limited to 'package') diff --git a/package/deps.mak b/package/deps.mak index 255ecdc..bb52f2c 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -38,24 +38,6 @@ service/system/s6-svscan-log/run: src/lib/service/system/s6-svscan-log/run $(DESTDIR)$(libdir)/service/system/s6-svscan-log/run: service/system/s6-svscan-log/run service/system/s6-svscan-log/notification-fd: src/lib/service/system/s6-svscan-log/notification-fd $(DESTDIR)$(libdir)/service/system/s6-svscan-log/notification-fd: service/system/s6-svscan-log/notification-fd -service/system/.s6-svscan/crash: src/lib/service/system/.s6-svscan/crash -$(DESTDIR)$(libdir)/service/system/.s6-svscan/crash: service/system/.s6-svscan/crash -service/system/.s6-svscan/SIGUSR1: src/lib/service/system/.s6-svscan/SIGUSR1 -$(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGUSR1: service/system/.s6-svscan/SIGUSR1 -service/system/.s6-svscan/finish: src/lib/service/system/.s6-svscan/finish -$(DESTDIR)$(libdir)/service/system/.s6-svscan/finish: service/system/.s6-svscan/finish -service/system/.s6-svscan/SIGQUIT: src/lib/service/system/.s6-svscan/SIGQUIT -$(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGQUIT: service/system/.s6-svscan/SIGQUIT -service/system/.s6-svscan/SIGINT: src/lib/service/system/.s6-svscan/SIGINT -$(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGINT: service/system/.s6-svscan/SIGINT -service/system/.s6-svscan/SIGUSR2: src/lib/service/system/.s6-svscan/SIGUSR2 -$(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGUSR2: service/system/.s6-svscan/SIGUSR2 -service/system/.s6-svscan/SIGWINCH: src/lib/service/system/.s6-svscan/SIGWINCH -$(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGWINCH: service/system/.s6-svscan/SIGWINCH -service/system/.s6-svscan/SIGTERM: src/lib/service/system/.s6-svscan/SIGTERM -$(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGTERM: service/system/.s6-svscan/SIGTERM -service/system/.s6-svscan/SIGPWR: src/lib/service/system/.s6-svscan/SIGPWR -$(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGPWR: service/system/.s6-svscan/SIGPWR service/system/s6-svscan-log-console/run: src/lib/service/system/s6-svscan-log-console/run $(DESTDIR)$(libdir)/service/system/s6-svscan-log-console/run: service/system/s6-svscan-log-console/run service/system/s6-svscan-log-console/notification-fd: src/lib/service/system/s6-svscan-log-console/notification-fd @@ -68,8 +50,14 @@ service/user/s6-svscan-log/run: src/lib/service/user/s6-svscan-log/run $(DESTDIR)$(libdir)/service/user/s6-svscan-log/run: service/user/s6-svscan-log/run service/user/s6-svscan-log/notification-fd: src/lib/service/user/s6-svscan-log/notification-fd $(DESTDIR)$(libdir)/service/user/s6-svscan-log/notification-fd: service/user/s6-svscan-log/notification-fd +service/user/.s6-svscan/finish: src/lib/service/user/.s6-svscan/finish +$(DESTDIR)$(libdir)/service/user/.s6-svscan/finish: service/user/.s6-svscan/finish service/user/.s6-svscan/SIGTERM: src/lib/service/user/.s6-svscan/SIGTERM $(DESTDIR)$(libdir)/service/user/.s6-svscan/SIGTERM: service/user/.s6-svscan/SIGTERM +service/user/goetia-shutdown/run: src/lib/service/user/goetia-shutdown/run +$(DESTDIR)$(libdir)/service/user/goetia-shutdown/run: service/user/goetia-shutdown/run +service/user/goetia-shutdown/down: src/lib/service/user/goetia-shutdown/down +$(DESTDIR)$(libdir)/service/user/goetia-shutdown/down: service/user/goetia-shutdown/down service/user/goetia-runner/run: src/lib/service/user/goetia-runner/run $(DESTDIR)$(libdir)/service/user/goetia-runner/run: service/user/goetia-runner/run service/user/goetia-runner/notification-fd: src/lib/service/user/goetia-runner/notification-fd diff --git a/package/modes b/package/modes index 4acc933..182f8f8 100644 --- a/package/modes +++ b/package/modes @@ -19,17 +19,10 @@ user-tmpfs 0755 service/system/goetia-runner/run 0755 service/system/s6-svscan-log/run 0755 service/system/s6-svscan-log-console/run 0755 -service/system/.s6-svscan/crash 0755 -service/system/.s6-svscan/finish 0755 -service/system/.s6-svscan/SIGINT 0755 -service/system/.s6-svscan/SIGPWR 0755 -service/system/.s6-svscan/SIGQUIT 0755 -service/system/.s6-svscan/SIGTERM 0755 -service/system/.s6-svscan/SIGUSR1 0755 -service/system/.s6-svscan/SIGUSR2 0755 -service/system/.s6-svscan/SIGWINCH 0755 +service/user/goetia-shutdown/run 0755 service/user/goetia-runner/run 0755 service/user/s6-svscan-log/run 0755 service/user/s6-svscan-log-console/run 0755 service/user/.s6-svscan/SIGTERM 0755 +service/user/.s6-svscan/finish 0755 diff --git a/package/targets.mak b/package/targets.mak index 43cbcae..8c63c9b 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -59,22 +59,16 @@ SLASHCOMMAND_BINS ::= \ ALL_LIBS ::= \ service/system/s6-svscan-log/run \ service/system/s6-svscan-log/notification-fd \ - service/system/.s6-svscan/crash \ - service/system/.s6-svscan/SIGUSR1 \ - service/system/.s6-svscan/finish \ - service/system/.s6-svscan/SIGQUIT \ - service/system/.s6-svscan/SIGINT \ - service/system/.s6-svscan/SIGUSR2 \ - service/system/.s6-svscan/SIGWINCH \ - service/system/.s6-svscan/SIGTERM \ - service/system/.s6-svscan/SIGPWR \ service/system/s6-svscan-log-console/run \ service/system/s6-svscan-log-console/notification-fd \ service/system/goetia-runner/run \ service/system/goetia-runner/notification-fd \ service/user/s6-svscan-log/run \ service/user/s6-svscan-log/notification-fd \ + service/user/.s6-svscan/finish \ service/user/.s6-svscan/SIGTERM \ + service/user/goetia-shutdown/run \ + service/user/goetia-shutdown/down \ service/user/goetia-runner/run \ service/user/goetia-runner/notification-fd \ source/system/other/dbus-daemon-srv/run \ @@ -253,22 +247,16 @@ ALL_LIBS ::= \ INSTALL_LIBS ::= \ $(DESTDIR)$(libdir)/service/system/s6-svscan-log/run \ $(DESTDIR)$(libdir)/service/system/s6-svscan-log/notification-fd \ - $(DESTDIR)$(libdir)/service/system/.s6-svscan/crash \ - $(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGUSR1 \ - $(DESTDIR)$(libdir)/service/system/.s6-svscan/finish \ - $(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGQUIT \ - $(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGINT \ - $(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGUSR2 \ - $(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGWINCH \ - $(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGTERM \ - $(DESTDIR)$(libdir)/service/system/.s6-svscan/SIGPWR \ $(DESTDIR)$(libdir)/service/system/s6-svscan-log-console/run \ $(DESTDIR)$(libdir)/service/system/s6-svscan-log-console/notification-fd \ $(DESTDIR)$(libdir)/service/system/goetia-runner/run \ $(DESTDIR)$(libdir)/service/system/goetia-runner/notification-fd \ $(DESTDIR)$(libdir)/service/user/s6-svscan-log/run \ $(DESTDIR)$(libdir)/service/user/s6-svscan-log/notification-fd \ + $(DESTDIR)$(libdir)/service/user/.s6-svscan/finish \ $(DESTDIR)$(libdir)/service/user/.s6-svscan/SIGTERM \ + $(DESTDIR)$(libdir)/service/user/goetia-shutdown/run \ + $(DESTDIR)$(libdir)/service/user/goetia-shutdown/down \ $(DESTDIR)$(libdir)/service/user/goetia-runner/run \ $(DESTDIR)$(libdir)/service/user/goetia-runner/notification-fd \ $(DESTDIR)$(libdir)/source/system/other/dbus-daemon-srv/run \ -- cgit v1.2.3