From e135a92c11f1fe1e13c1c17df6616bae56d215e8 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 6 Jan 2026 03:05:27 +0000 Subject: Update deps, update some docs --- AUTHORS | 3 - INSTALL | 8 +-- doc/index.html | 29 ++++---- doc/s6-frontend-alias-chpst.html | 83 --------------------- doc/s6-frontend-alias-sv.html | 66 ----------------- doc/s6-frontend-alias.html | 128 --------------------------------- doc/s6-frontend-config-preprocess.html | 87 ---------------------- package/deps-build | 4 +- 8 files changed, 21 insertions(+), 387 deletions(-) delete mode 100644 doc/s6-frontend-alias-chpst.html delete mode 100644 doc/s6-frontend-alias-sv.html delete mode 100644 doc/s6-frontend-alias.html delete mode 100644 doc/s6-frontend-config-preprocess.html diff --git a/AUTHORS b/AUTHORS index e05b68c..7a708a1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,2 @@ Main author: Laurent Bercot - -Contributors: - Colin Booth diff --git a/INSTALL b/INSTALL index 6daa312..c85357c 100644 --- a/INSTALL +++ b/INSTALL @@ -6,13 +6,13 @@ Build Instructions - A POSIX compatible system with a standard C development environment - GNU make version 3.81 or later - - skalibs version 2.14.5.0 or later: https://skarnet.org/software/skalibs/ - - nsss version 0.2.1.1 or later: https://skarnet.org/software/nsss/ - - execline version 2.9.8.0 or later: https://skarnet.org/software/execline/ + - skalibs version 2.14.5.1 or later: https://skarnet.org/software/skalibs/ + - execline version 2.9.8.1 or later: https://skarnet.org/software/execline/ - s6 version 2.14.0.0 or later: https://skarnet.org/software/s6/ - s6-rc version 0.6.0.0 or later: https://skarnet.org/software/s6-rc/ - optional: s6-linux-init version 1.2.0.0 or later: https://skarnet.org/software/s6-linux-init/ - - optional: util-linux v2.41.2 or later: https://en.wikipedia.org/wiki/Util-linux + - optional: nsss version 0.2.1.1 or later: https://skarnet.org/software/nsss/ + - optional: util-linux version 2.41.2 or later: https://en.wikipedia.org/wiki/Util-linux * Standard usage diff --git a/doc/index.html b/doc/index.html index a82dbe7..70ca515 100644 --- a/doc/index.html +++ b/doc/index.html @@ -67,24 +67,29 @@ they implement a powerful, fast, turnkey init system that is usable on

A Linux-based system with a standard C development environment

GNU make, version 3.81 or later

skalibs version -2.14.5.0 or later

nsss version -0.2.1.1 or later

+2.14.5.1 or later

execline version -2.9.8.0 or later

+2.9.8.1 or later

s6 version 2.14.0.0 or later

s6-rc version 0.6.0.0 or later

s6-linux-init version +

Optional: nsss version +0.2.1.1 or later

Optional: s6-linux-init version 1.2.0.0 or later

Optional: util-linux version +2.41.2 or later

- Those are all build-time dependencies as well as run-time dependencies. -skalibs is only a run-time dependency if you link the binaries against -the shared version of the skarnet library. -

All the skaware packages are build-time dependencies as well as run-time dependencies. +
- skalibs is only a run-time dependency if you link the binaries against +the shared version of the skarnet library.
util-linux is a run-time dependency only.

Licensing

@@ -134,10 +139,6 @@ the previous versions of s6-frontend and the current one.

The s6-frontend-config-preprocess program
The s6-frontend-alias program
The s6-frontend-alias-chpst program
The s6-frontend-alias-sv program

Related resources

diff --git a/doc/s6-frontend-alias-chpst.html b/doc/s6-frontend-alias-chpst.html deleted file mode 100644 index f67ab32..0000000 --- a/doc/s6-frontend-alias-chpst.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - s6-frontend: the s6-frontend-alias-chpst program - - - - - - -

-s6-frontend
-Software
-skarnet.org -

- -

The `s6-frontend-alias-chpst` program

- -

-s6-frontend-alias-chpst implements -runit's -chpst command -by rewriting itself into a command line made of idiomatic -chainloading s6 commands. -

- -

Interface

- -

-     s6-frontend-alias-chpst [ -v ] [ -P ] [ -0 ] [ -1 ] [ -2 ] [ -u user ] [ -U user ] [ -b argv0 ] [ -e dir ] [ -/ root ] [ -n niceness ] [ -l|-L lock ] [ -m bytes ] [ -d bytes ] [ -o n ] [ -p n ] [ -f bytes ] [ -c bytes ] prog...
-

- -

- When s6-frontend has been configured with the ---enable-aliases-runit option, the -s6-frontend-alias-chpst program is built, and at installation -time, a chpst symbolic link is created, pointing to it. -

- -

- s6-frontend-alias-chpst implements most of the functionality of -chpst, as closely as -possible. It does so by rewriting itself into a command line that may -invoke one or more of the following programs: -

- -

The Unix nice command
The s6 s6-setsid command
The s6 s6-envdir command
The s6 s6-setlock command
The s6 s6-applyuidgid command
The s6 s6-envuidgid command
The s6 s6-softlimit command
The execline fdclose command
The execline exec command
The non-standard (but ubiquitous) Unix chroot command

- -

Notes

- -

When the -v option is given, -s6-frontend-alias-chpst prints an informational -message to stderr, showing the entire command line it is going to execute into.
s6-frontend-alias-chpst is a convenience program, written -so that runit users can keep using chpst while learning the -corresponding idiomatic s6 commands. However, it is not an "official" -interface. chpst acts as a big toolbox, whereas s6 prefers the -"one function = one tool" philosophy. It is recommended that runit users -who are new to s6 use the -v option to see how their chpst -invocation translates into s6 parlance.
Some chpst -u invocations do not translate perfectly -because s6 uses a slightly different model of acquiring user and group -identity via -s6-envuidgid. -This should not prevent chpst from working.

- - - diff --git a/doc/s6-frontend-alias-sv.html b/doc/s6-frontend-alias-sv.html deleted file mode 100644 index a619661..0000000 --- a/doc/s6-frontend-alias-sv.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - s6-frontend: the s6-frontend-alias-sv program - - - - - - -

-s6-frontend
-Software
-skarnet.org -

- -

The `s6-frontend-alias-sv` program

- -

-s6-frontend-alias-sv implements -runit's -sv command over a -s6 supervision tree, via -native s6 commands. - -

- -

Interface

- -

-     s6-frontend-alias-sv [ -v ] [ -w secs ] command services...
-

- -

- When s6-frontend has been configured with the ---enable-aliases-runit option, the -s6-frontend-alias-sv program is built, and at installation -time, a sv symbolic link is created, pointing to it. -

- -

- s6-frontend-alias-sv implements most of the functionality of -sv, as closely as -possible. When some functionality cannot be emulated on a s6 -supervision tree, it prints an error message to stderr and exits 100. -

- -

Notes

- -

s6-frontend-alias-sv is a convenience program, written -so that runit users can keep using sv to control their -s6 services. However, it is not an "official" interface, because there -are a few fundamental differences between the conception of runit and -the conception of s6 that make sv a poor fit to accurately -interface with the advanced features of s6. It is recommended that -sv users become familiar with idiomatic s6 commands such as -s6-svc, -s6-svstat, and -s6-svwait.

- - - diff --git a/doc/s6-frontend-alias.html b/doc/s6-frontend-alias.html deleted file mode 100644 index 369c792..0000000 --- a/doc/s6-frontend-alias.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - s6-frontend: the s6-frontend-alias program - - - - - - -

-s6-frontend
-Software
-skarnet.org -

- -

The `s6-frontend-alias` program

- -

-s6-frontend-alias is a multicall binary that implements -functionality from the -daemontools package, -and/or from the -runit package, whenever -possible, via -s6 commands. -

- -

Interface

- -

-     s6-frontend-alias [ -v ] daemontools_command args...
-     s6-frontend-alias [ -v ] runit_command args...
-     daemontools_command args...
-     runit_command args...
-

- -

-s6-frontend-alias can be called as is: then it takes the command -name as its argument. Or, it can be called directly as the wanted command. -It finds the closest approximation of the command in the s6 world, and -executes into it. When it cannot find a suitable idiomatic s6 version of -the wanted command, it prints an explanatory message to stderr, then -exits 100. -

- -

-s6-frontend-alias is only built when at least one of the ---enable-alias-daemontools and --enable-alias-runit -options have been given to configure at build time. -

- -

-When the --enable-alias-daemontools option has been given, -the following commands are created at installation time as symbolic -links to s6-frontend-alias, which recognizes them: -

- -

envdir
envuidgid
fghack
multilog
pgrphack
readproctitle
setlock
setuidgid
softlimit
supervise
svc
svok
svscan
svscanboot
svstat
tai64n
tai64nlocal

- -

-When the --enable-alias-runit option has been given, -the following commands are created at installation time as symbolic -links to s6-frontend-alias, which recognizes them: -

- -

runit
runit-init
runsvdir
runsvchdir
runsv
svlogd
utmpset

- -

-(The chpst and sv runit commands are recognized -by s6-frontend-alias, but handled by specific programs, -s6-frontend-alias-chpst and -s6-frontend-alias-sv, and the -chpst and sv symbolic links point directly to those -programs.) -

- -

Options

- -

-v : verbose. When s6-frontend-alias -is called under its own name and this option is given, it prints -an explanatory message to stderr before executing into the -corresponding idiomatic s6 command.

- -

Notes

- -

s6-frontend-alias is a convenience program, written -so that daemontools and runit users can keep using their habits while -transitioning to s6. However, it is not an "official" interface, -because s6 is strictly more powerful than daemontools, and has a few -significant fundamental differences with runit. Daemontools and runit -users are still encouraged to learn and get used to the native -s6 commands.

- - - diff --git a/doc/s6-frontend-config-preprocess.html b/doc/s6-frontend-config-preprocess.html deleted file mode 100644 index 50a3bfc..0000000 --- a/doc/s6-frontend-config-preprocess.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - s6-frontend: the s6-frontend-config-preprocess program - - - - - - -

-s6-frontend
-Software
-skarnet.org -

- -

The s6-frontend-config-preprocess program

- -

- s6-frontend-config-preprocess reads a s6-frontend configuration -file and executes all its inclusion directives, also preprocessing the -included files. It streams the result to stdout, which is a complete -configuration file without inclusions. -

- -

Interface

- -

-     s6-frontend-config-preprocess file
-

- -

- s6-frontend-config-preprocess reads file and prints it -to stdout. It removes lines starting with !!. -

- -

- When it finds a !include or !includeonce directive -in file, it replaces it with the contents of the included -file - recursively preprocessed. -

- -

- When it finds a !includedir or !includedironce -directive in file, it replaces it with the recursively -preprocessed contents of every file present in the included -directory. The files are sorted alphabetically according to the -C locale. -

- -

- !includeonce and !includedironce only print -a file (resp. a directory) the first time they encounter it, and -silently ignore subsequent instances. !include and -!includedir directives will happily include the same -files several times. -

- -

- To avoid loops, a nesting limit exists. s6-frontend-config-preprocess -will fail if there are too many nested inclusions. -

- -

Exit codes

- -

0: success
1: syntax error in a configuration file
2: other error in a configuration file
3: too many nested inclusions
100: usage error
111: system call failed

- -

Notes

- -

s6-frontend-config-preprocess is not meant to be -called directly by the user. It is normally invoked by -s6-frontend-config-parse. -However, the binary is made available for debugging purposes.

- - - diff --git a/package/deps-build b/package/deps-build index 32e84d9..b9e7dfa 100644 --- a/package/deps-build +++ b/package/deps-build @@ -1,6 +1,6 @@ -true true /package/prog/skalibs 2.14.5.0 libskarnet +true true /package/prog/skalibs 2.14.5.1 libskarnet $usensss $usensss /package/admin/nsss 0.2.1.1 libnsss -true false /package/admin/execline 2.9.8.0 libexecline +true false /package/admin/execline 2.9.8.1 libexecline true false /package/admin/s6 2.14.0.0 libs6 libs6auto true false /package/admin/s6-rc 0.6.0.0 libs6rc true false /package/admin/s6-linux-init 1.2.0.0 -- cgit v1.3.1

Licensing

Related resources

The s6-frontend-alias-chpst program

Interface

Notes

The s6-frontend-alias-sv program

Interface

Notes

The s6-frontend-alias program

Interface

Options

Notes

The s6-frontend-config-preprocess program

Interface

Exit codes

Notes

The `s6-frontend-alias-chpst` program

The `s6-frontend-alias-sv` program

The `s6-frontend-alias` program