diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-22 17:21:03 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-22 17:21:03 +0000 |
| commit | f0ca86424f048b1042611fef65bdd9d2e8a2372b (patch) | |
| tree | 6c5ca2648ffc2ee1ec503dc192a89309614f3413 /system | |
| parent | 85778be046ee5ea714511e4eab9fb579972fbad7 (diff) | |
| parent | 2d5bb95bb096b535989210cbb3ce9fc9fc3dd9b9 (diff) | |
| download | packages-f0ca86424f048b1042611fef65bdd9d2e8a2372b.tar.gz packages-f0ca86424f048b1042611fef65bdd9d2e8a2372b.tar.bz2 packages-f0ca86424f048b1042611fef65bdd9d2e8a2372b.tar.xz packages-f0ca86424f048b1042611fef65bdd9d2e8a2372b.zip | |
Merge branch 'lr.skaware' into 'master'
system/s6-linux-init-early-getty: new subpackage of s6-linux-init
See merge request adelie/packages!291
Diffstat (limited to 'system')
| -rw-r--r-- | system/gettys-openrc/APKBUILD | 4 | ||||
| -rw-r--r-- | system/gettys-openrc/gettys.initd | 8 | ||||
| -rw-r--r-- | system/s6-linux-init/APKBUILD | 17 |
3 files changed, 22 insertions, 7 deletions
diff --git a/system/gettys-openrc/APKBUILD b/system/gettys-openrc/APKBUILD index bacb96d11..cde63a648 100644 --- a/system/gettys-openrc/APKBUILD +++ b/system/gettys-openrc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=gettys-openrc -pkgver=0.0.2.0 +pkgver=0.0.2.1 pkgrel=0 pkgdesc="Dynamic getty services" url="https://adelielinux.org/" @@ -21,4 +21,4 @@ package() { } sha512sums="50039958291cd546c51ce5a30d319f5c5cf7d310fb3cd9f7ad1632fa4bc55775cdac740f76886ff5869a2cfa3f345e760672cebf7727c7ca2514358bcc17e531 gettys.confd -ad086549334cf2ff49bf95eb7d89aed8497a7533487aa4770d0fed884baab648c5da5f4db7ba8b7613d2dc5eea5d165a484ee7029fe660e97791f954aff171b3 gettys.initd" +4fdb5e177bc6862e8b55c1252079a2ee31d25e157cd6a36bae766e25d2a79ba4b731d35660e01b38325bf8ae8a9ea9ccfddb5ec662ba1bb76e71ce9372ab608a gettys.initd" diff --git a/system/gettys-openrc/gettys.initd b/system/gettys-openrc/gettys.initd index 5181d9af2..a1fbb2082 100644 --- a/system/gettys-openrc/gettys.initd +++ b/system/gettys-openrc/gettys.initd @@ -47,8 +47,12 @@ start() { for i in $GETTYS ; do if test -c /dev/"$i" ; then - makeservice "$i" - ln -nsf "/var/lib/s6/services/getty-$i" "/run/service/getty-$i" + if test -d "/etc/s6-linux-init/current/run-image/service/getty-$i" ; then + : + else + makeservice "$i" + ln -nsf "/var/lib/s6/services/getty-$i" "/run/service/getty-$i" + fi fi done diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index aed46e575..d1cead76d 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.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="A s6-based init system" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -11,11 +11,11 @@ license="ISC" _skalibs_version=2.8.1.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-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" +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" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" provides="/sbin/init=0" - +_earlytty=tty2 build() { cd "$builddir" @@ -46,6 +46,7 @@ package() { ./s6-linux-init-maker \ -u catchlog \ + -G "/sbin/agetty -- 38400 $_earlytty linux" \ -1 \ -L \ -p "/usr/bin:/usr/sbin:/bin:/sbin" \ @@ -77,6 +78,16 @@ common() { } +earlygetty() { + pkgdesc="Files for an early getty on $_earlytty" + 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" +} + + libs() { pkgdesc="$pkgdesc (shared libraries)" depends="skalibs-libs>=$_skalibs_version" |