diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2022-02-27 01:02:52 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2022-02-27 01:02:52 +0000 |
| commit | a802a70ea4e720e8325e13e89a4915eef64a3c87 (patch) | |
| tree | 81b10e982273817700dae17f83a7cb4f29eb29ec | |
| parent | dbbf64f5e5ff8f5cc3c2e6432f74cf6c27fe3362 (diff) | |
| download | s6-linux-init-a802a70ea4e720e8325e13e89a4915eef64a3c87.tar.xz | |
Noclamp the stage 1 envdir
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | doc/index.html | 4 | ||||
| -rw-r--r-- | doc/upgrade.html | 5 | ||||
| -rw-r--r-- | src/init/s6-linux-init.c | 2 |
5 files changed, 10 insertions, 6 deletions
@@ -6,11 +6,11 @@ Build Instructions - A Linux-based system with a standard C development environment - GNU make version 3.81 or later - - skalibs version 2.11.1.0 or later: https://skarnet.org/software/skalibs/ + - skalibs version 2.11.2.0 or later: https://skarnet.org/software/skalibs/ - Optional: nsss version 0.2.0.1 or later: https://skarnet.org/software/nsss/ - Optional: utmps version 0.1.1.0 or later: https://skarnet.org/software/utmps/ - execline version 2.8.2.0 or later: https://skarnet.org/software/execline/ - - s6 version 2.11.0.1 or later: https://skarnet.org/software/s6/ + - s6 version 2.11.1.0 or later: https://skarnet.org/software/s6/ This software is Linux-specific. It will run on a Linux kernel, version 2.6.32 or later. However, it should not be too hard to port to @@ -4,6 +4,7 @@ In 1.0.7.2 ---------- - Bugfixes (for use in containers). + - The stage 1 initial envdir is read verbatim and noclamped. In 1.0.7.1 diff --git a/doc/index.html b/doc/index.html index f273dcb..43ad092 100644 --- a/doc/index.html +++ b/doc/index.html @@ -73,7 +73,7 @@ kernel command line </li> <li> A Linux-based system with a standard C development environment </li> <li> GNU make, version 3.81 or later </li> <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version -2.11.1.0 or later. It's a build-time requirement. It's also a run-time +2.11.2.0 or later. It's a build-time requirement. It's also a run-time requirement (for <a href="s6-linux-init-maker.html">s6-linux-init-maker</a>) as well as a boot-time requirement (i.e. a run-time requirement for the programs used when you boot a system created with @@ -82,7 +82,7 @@ against the shared version of the skalibs library. </li> <li> <a href="//skarnet.org/software/execline/">execline</a> version 2.8.2.0 or later. It is a build-time and boot-time requirement. </li> <li> <a href="//skarnet.org/software/s6/">s6</a> version -2.11.0.1 or later. It is a build-time and boot-time requirement. </li> +2.11.1.0 or later. It is a build-time and boot-time requirement. </li> </ul> <p> diff --git a/doc/upgrade.html b/doc/upgrade.html index 1c56ac3..63c7c48 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -21,7 +21,10 @@ <h2> in 1.0.7.2 </h2> <ul> - <li> No functional changes. </li> + <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> +dependency bumped to 2.11.2.0. </li> + <li> <a href="//skarnet.org/software/s6/">s6</a> +dependency bumped to 2.11.1.0. </li> </ul> <h2> in 1.0.7.1 </h2> diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c index 4fcbdcb..d0bb442 100644 --- a/src/init/s6-linux-init.c +++ b/src/init/s6-linux-init.c @@ -269,7 +269,7 @@ int main (int argc, char const **argv, char const *const *envp) if (!hiercopy(fn, S6_LINUX_INIT_TMPFS)) strerr_diefu3sys(111, "copy ", fn, " to " S6_LINUX_INIT_TMPFS) ; memcpy(fn + dirlen + 1, ENVSTAGE1, sizeof(ENVSTAGE1)) ; - if (envdir_verbatim_chomp(fn, &envmodifs) == -1) + if (envdir_internal(fn, &envmodifs, SKALIBS_ENVDIR_VERBATIM | SKALIBS_ENVDIR_NOCLAMP, '\n') == -1) strerr_warnwu2sys("envdir ", fn) ; } if (envdumpdir && !env_dump(envdumpdir, 0700, envp)) |