diff options
| author | Laurent Bercot <ska-adelie@skarnet.org> | 2019-10-03 10:31:29 -0500 |
|---|---|---|
| committer | Laurent Bercot <ska-adelie@skarnet.org> | 2019-10-03 10:31:29 -0500 |
| commit | 2c782daf6fae1b418168a5e8a9336fe9e6b9215e (patch) | |
| tree | 8b749945bc1d8baca29d60e573ceadbab69e8c6f /system/s6-linux-init/APKBUILD | |
| parent | 7fabe3e35d27fd34b780d135ac09b846a4083257 (diff) | |
| download | packages-2c782daf6fae1b418168a5e8a9336fe9e6b9215e.tar.gz packages-2c782daf6fae1b418168a5e8a9336fe9e6b9215e.tar.bz2 packages-2c782daf6fae1b418168a5e8a9336fe9e6b9215e.tar.xz packages-2c782daf6fae1b418168a5e8a9336fe9e6b9215e.zip | |
system/s6-linux-init: make early getty configurable. PLEASE REVIEW.
Also touches gettys-openrc to avoid spawning the same getty twice.
Diffstat (limited to 'system/s6-linux-init/APKBUILD')
| -rw-r--r-- | system/s6-linux-init/APKBUILD | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index 7dff13d2e..d9855abd2 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init pkgver=1.0.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="A s6-based init system" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -12,10 +12,9 @@ _skalibs_version=2.9.0.0 depends="execline s6 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" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh earlygetty.run" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" provides="/sbin/init=0" -_earlytty=tty2 build() { cd "$builddir" @@ -46,7 +45,7 @@ package() { ./s6-linux-init-maker \ -u catchlog \ - -G "/sbin/agetty -- 38400 $_earlytty linux" \ + -G "sleep 86400" \ -1 \ -L \ -p "/usr/bin:/usr/sbin:/bin:/sbin" \ @@ -78,12 +77,14 @@ common() { earlygetty() { - pkgdesc="Files for an early getty on $_earlytty" + pkgdesc="Files for a configurable early getty" depends="s6-linux-init-common" svcimg="$pkgdir/etc/s6-linux-init/current/run-image/service" subsvcimg="$subpkgdir/etc/s6-linux-init/current/run-image/service" mkdir -p -m 0755 "$subsvcimg" - mv "$svcimg/s6-linux-init-early-getty" "$subsvcimg/getty-$_earlytty" + mv "$svcimg/s6-linux-init-early-getty" "$subsvcimg/" + cp -f "$srcdir/earlygetty.run" "$subsvcimg/s6-linux-init-early-getty/run" + chmod 0755 "$subsvcimg/s6-linux-init-early-getty/run" } |