summaryrefslogtreecommitdiff
path: root/system/s6-linux-init
diff options
context:
space:
mode:
authorLaurent Bercot <ska-adelie@skarnet.org>2022-06-16 21:28:12 +0000
committerLaurent Bercot <ska-adelie@skarnet.org>2022-06-16 21:28:12 +0000
commit65355eb7145f09bbea6fb0ad93ae862a2f0385cd (patch)
treeb4c0eb13de6296bf2f6d2a6830e1f04153b98434 /system/s6-linux-init
parenta8f9604ed485c973a6ba5fef3918a09d03ffc6c2 (diff)
downloadpackages-65355eb7145f09bbea6fb0ad93ae862a2f0385cd.tar.gz
packages-65355eb7145f09bbea6fb0ad93ae862a2f0385cd.tar.bz2
packages-65355eb7145f09bbea6fb0ad93ae862a2f0385cd.tar.xz
packages-65355eb7145f09bbea6fb0ad93ae862a2f0385cd.zip
Skaware.20220616
Diffstat (limited to 'system/s6-linux-init')
-rw-r--r--system/s6-linux-init/APKBUILD10
-rw-r--r--system/s6-linux-init/earlygetty.run2
2 files changed, 6 insertions, 6 deletions
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 87c00210c..9518c97cf 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-linux-init
-pkgver=1.0.7.0
+pkgver=1.0.8.0
pkgrel=0
pkgdesc="A s6-based init system"
url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite.
license="ISC"
-_skalibs_version=2.11
-_s6_version=2.11
+_skalibs_version=2.12
+_s6_version=2.11.1.1
depends="execline s6>=$_s6_version s6-linux-init-common"
makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev"
subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
@@ -119,9 +119,9 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="bcda7787d6519b04d8eef36b9db84af17bafb7bc33047b0d79d46dcbd2f0c622e787c056b5ac3633b2a365eafbdbe3744162fa10005d01732c496f54e5bb56f0 s6-linux-init-1.0.7.0.tar.gz
+sha512sums="b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346 s6-linux-init-1.0.8.0.tar.gz
756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init
e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel
7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown
6fb2a1112988fd2322b4bc4862bfb948a1c2e43921c5d01ae873c0d31b39fe74fc2934a5018c08b1704a2b2199b31d3a3d7365be369bba734f153b74e000aa74 reboot.sh
-67b8dfc5e4174d7ec6fab4ac618e6acf27481808bbaa7cfd3d805dc3e66c017f76e30c5e1ce5d5a5bb5ba3fbf97c0d8b864d8095fae40d1ae9dad3ae629811f9 earlygetty.run"
+dfff483b61370ce2c8fe653cb4e9b6ec7ef678f26b128eab8e677548a48b668b532b12a2e4618c85bf95777a666ac30189780708803d6ea12e43ab0072399212 earlygetty.run"
diff --git a/system/s6-linux-init/earlygetty.run b/system/s6-linux-init/earlygetty.run
index 5e60e7028..072fdd7d2 100644
--- a/system/s6-linux-init/earlygetty.run
+++ b/system/s6-linux-init/earlygetty.run
@@ -4,7 +4,7 @@ tty=tty2
baud=
options='-L'
-if line=`head -n 1 /run/kernel_env/earlygetty` ; then
+if line=`head -n 1 /run/kernel_env/earlygetty 2>/dev/null` ; then
tty="${line%%,*}"
bpnf="${line##*,}"
nf=