diff options
| author | Zach van Rijn <me@zv.io> | 2021-10-16 01:12:16 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2021-10-16 01:12:16 +0000 |
| commit | 6ca2ba5c92a7b0679a552725678a40ed5eb4ded5 (patch) | |
| tree | ddc300a108dc4d10ed5ed0188175f54452e8bb0e /system/s6 | |
| parent | aa90e62ce757fa863685f44ce23f129f56b3225f (diff) | |
| parent | c0f3f757abe6ea39579119b99e9996c4e2bf0e11 (diff) | |
| download | packages-6ca2ba5c92a7b0679a552725678a40ed5eb4ded5.tar.gz packages-6ca2ba5c92a7b0679a552725678a40ed5eb4ded5.tar.bz2 packages-6ca2ba5c92a7b0679a552725678a40ed5eb4ded5.tar.xz packages-6ca2ba5c92a7b0679a552725678a40ed5eb4ded5.zip | |
Merge branch 'master' into 'awilfox/bump/2021-09-system-abipreserve'
# Conflicts:
# system/curl/APKBUILD
Diffstat (limited to 'system/s6')
| -rw-r--r-- | system/s6/APKBUILD | 6 | ||||
| -rw-r--r-- | system/s6/s6.post-upgrade | 25 | ||||
| -rw-r--r-- | system/s6/s6.trigger | 2 |
3 files changed, 4 insertions, 29 deletions
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 489a8ef22..1ba685820 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.10.0.2 +pkgver=2.11.0.0 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.10.0.0 +_skalibs_version=2.11 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev" install="$pkgname.post-upgrade" @@ -67,4 +67,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="d3eb7e17f3eeb4250c734208a1e9a71b4da0ae3d5090e98c3b02749d42ab83c20f405f1d219293bc378223e31410f0cbfec497c64518235faad9c0ccc6a348dc s6-2.10.0.2.tar.gz" +sha512sums="5421b01de6d4f75e80056d3335cef409b3eb1330f1585c8b303228a36e60537056bed130f3f375f3f02f9063be04fc8776c4687cb0ec23e969960ad3fb5141e3 s6-2.11.0.0.tar.gz" diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade index 3188f031d..54144895b 100644 --- a/system/s6/s6.post-upgrade +++ b/system/s6/s6.post-upgrade @@ -1,28 +1,3 @@ #!/bin/sh -e -newv="$1" -oldv="$2" - rm -f /etc/runlevels/default/s6 - -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. If you are using sysvinit, please use the -* following command, run as root: -* -* s6-svscanctl -t /run/service -* -* Running this command will instantly log everyone out of all the -* 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 diff --git a/system/s6/s6.trigger b/system/s6/s6.trigger index 8db8d9a5a..36aa83841 100644 --- a/system/s6/s6.trigger +++ b/system/s6/s6.trigger @@ -1,3 +1,3 @@ #!/bin/execlineb -P -s6-svscanctl -aN /run/service +s6-svscanctl -an /run/service |