diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2021-07-22 21:02:46 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2021-07-22 21:02:46 -0500 |
| commit | 59068642667b2748b2f24d18c58b1d2fdfed7619 (patch) | |
| tree | deca4d721637676253ed1270f252f8d389286151 /system/s6 | |
| parent | 4a177049e3d486da3f54d346d63ea80699c08b5b (diff) | |
| parent | 50e523c03bbcb6be1298e3dedb0441b7e47ab2eb (diff) | |
| download | packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.gz packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.bz2 packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.xz packages-59068642667b2748b2f24d18c58b1d2fdfed7619.zip | |
Merge branch 'master' into kpartx
Diffstat (limited to 'system/s6')
| -rw-r--r-- | system/s6/APKBUILD | 7 | ||||
| -rw-r--r-- | system/s6/s6.post-upgrade | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 4909c3daf..489a8ef22 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.9.2.0 +pkgver=2.10.0.2 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.2.1 +_skalibs_version=2.10.0.0 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev" install="$pkgname.post-upgrade" @@ -66,4 +66,5 @@ doc() { mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee s6-2.9.2.0.tar.gz" + +sha512sums="d3eb7e17f3eeb4250c734208a1e9a71b4da0ae3d5090e98c3b02749d42ab83c20f405f1d219293bc378223e31410f0cbfec497c64518235faad9c0ccc6a348dc s6-2.10.0.2.tar.gz" diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade index 26d289c27..3188f031d 100644 --- a/system/s6/s6.post-upgrade +++ b/system/s6/s6.post-upgrade @@ -5,13 +5,14 @@ oldv="$2" rm -f /etc/runlevels/default/s6 -if test `apk version -t "$oldv" 2.8` = "<" ; then +if test `apk version -t "$oldv" 2.9` = "<" ; then cat <<EOF * * The s6 package has been upgraded. To complete the upgrade, you need to -* restart the supervision tree - with the following command, run as root: +* restart the supervision tree. If you are using sysvinit, please use the +* following command, run as root: * * s6-svscanctl -t /run/service * @@ -19,6 +20,9 @@ if test `apk version -t "$oldv" 2.8` = "<" ; then * terminals that are listed in the GETTYS variable in /etc/conf.d/gettys * - so please save your work first. * +* If you are using s6-linux-init, which is the default, please just +* reboot your machine as soon as is convenient for you. +* EOF fi |