From 1b582b8db0dbfa8557c9976b131c7dd5d955f97f Mon Sep 17 00:00:00 2001
From: Laurent Bercot
Date: Sun, 18 Oct 2026 00:37:42 +0000
Subject: Prepare for 0.2.0.0; adjust s6 live install --init to new s6-rc
---
INSTALL | 10 +++++-----
NEWS | 6 ++++++
doc/index.html | 16 ++++++++--------
doc/upgrade.html | 13 +++++++++++++
package/deps-build | 8 ++++----
package/info | 2 +-
src/s6-frontend/live_install.c | 8 ++++++--
7 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/INSTALL b/INSTALL
index 40b530b..2c0a5f8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,12 +6,12 @@ Build Instructions
- A POSIX compatible system with a standard C development environment
- GNU make version 3.81 or later
- - skalibs version 2.15.1.0 or later: https://skarnet.org/software/skalibs/
- - execline version 2.9.9.2 or later: https://skarnet.org/software/execline/
- - s6 version 2.15.1.0 or later: https://skarnet.org/software/s6/
- - s6-rc version 0.7.0.0 or later: https://skarnet.org/software/s6-rc/
+ - skalibs version 2.16.0.0 or later: https://skarnet.org/software/skalibs/
+ - execline version 2.10.0.0 or later: https://skarnet.org/software/execline/
+ - s6 version 2.15.1.1 or later: https://skarnet.org/software/s6/
+ - s6-rc version 0.8.0.0 or later: https://skarnet.org/software/s6-rc/
- optional: s6-linux-init version 1.2.0.2 or later: https://skarnet.org/software/s6-linux-init/
- - optional: nsss version 0.2.1.2 or later: https://skarnet.org/software/nsss/
+ - optional: nsss version 0.2.1.3 or later: https://skarnet.org/software/nsss/
- optional: util-linux version 2.41.2 or later: https://en.wikipedia.org/wiki/Util-linux
diff --git a/NEWS b/NEWS
index 91074f1..7b134c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
Changelog for s6-frontend.
+In 0.2.0.0
+----------
+
+ - Bugfixes.
+
+
In 0.1.0.0
----------
diff --git a/doc/index.html b/doc/index.html
index 6c1534a..70026bc 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -55,7 +55,7 @@ is often used on its own, in environments that already have an init system
(no need for s6-linux-init) and a service manager (no need for s6-rc).
For the same purpose of modularity, s6 follows an approach of "one functionality,
one tool", sometimes to the extreme: the s6-supervision package, as of
-2.15.1.0, hosts 75 binaries.
+2.15.1.1, hosts 75 binaries.
@@ -88,18 +88,18 @@ parts of an s6-based system.
A Linux-based system with a standard C development environment
GNU make, version 3.81 or later
skalibs version
-2.15.1.0 or later
+2.16.0.0 or later
Optional: nsss version
0.2.1.3 or later. You only need this if all your distribution is built
with it. If you're not sure, you don't need it.
execline version
-2.9.9.2 or later
+2.10.0.0 or later
s6 version
-2.15.1.0 or later
+2.15.1.1 or later
s6-rc version
-0.7.0.0 or later
+0.8.0.0 or later
Optional: nsss version
-0.2.1.2 or later
+0.2.1.3 or later
Optional: s6-linux-init version
1.2.0.2 or later
Optional: util-linux version
@@ -130,8 +130,8 @@ across operating systems.
- The current released version of s6-frontend is
-0.1.0.0.
-You can access its checksum here.
+0.2.0.0.
+You can access its checksum here.
- Alternatively, you can checkout a copy of the
s6-frontend
git repository:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 50a038f..b929a77 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -19,6 +19,19 @@
What has changed in s6-frontend
+ in 0.2.0.0
+
+
+ - skalibs
+dependency bumped to 2.16.0.0.
+ - execline
+dependency bumped to 2.10.0.0
+ - s6
+dependency bumped to 2.15.1.1.
+ - s6-rc
+dependency bumped to 0.8.0.0.
+
+
in 0.1.0.0
diff --git a/package/deps-build b/package/deps-build
index e956443..4259f15 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1,6 +1,6 @@
-true true /package/prog/skalibs 2.15.1.0 libskarnet
+true true /package/prog/skalibs 2.16.0.0 libskarnet
$usensss $usensss /package/admin/nsss 0.2.1.3 libnsss
-true false /package/admin/execline 2.9.9.2 libexecline
-true false /package/admin/s6 2.15.1.0 libs6 libs6auto
-true false /package/admin/s6-rc 0.7.0.0 libs6rc
+true false /package/admin/execline 2.10.0.0 libexecline
+true false /package/admin/s6 2.15.1.1 libs6 libs6auto
+true false /package/admin/s6-rc 0.8.0.0 libs6rc
true false /package/admin/s6-linux-init 1.2.0.2
diff --git a/package/info b/package/info
index 5c0257f..eebabff 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=s6-frontend
-version=0.1.0.0
+version=0.2.0.0
category=admin
package_macro_name=S6_FRONTEND
diff --git a/src/s6-frontend/live_install.c b/src/s6-frontend/live_install.c
index 10861f3..49dab81 100644
--- a/src/s6-frontend/live_install.c
+++ b/src/s6-frontend/live_install.c
@@ -41,7 +41,7 @@ void live_install (char const *const *argv)
uint64_t wgolb = 0 ;
unsigned int m = 0 ;
char const *wgola[GOLA_N] = { 0 } ;
- char const *newargv[18] ;
+ char const *newargv[19] ;
char fmtv[UINT_FMT] ;
wgola[GOLA_SET] = "current" ;
@@ -69,7 +69,11 @@ void live_install (char const *const *argv)
newargv[m++] = "-f" ;
newargv[m++] = wgola[GOLA_CONVFILE] ;
}
- if (wgolb & GOLB_INIT) newargv[m++] = "--no-update" ;
+ if (wgolb & GOLB_INIT)
+ {
+ newargv[m++] = "--no-update" ;
+ newargv[m++] = "--no-snapshot" ;
+ }
newargv[m++] = "--" ;
newargv[m++] = wgola[GOLA_SET] ;
newargv[m++] = 0 ;
--
cgit v1.3.1