diff options
| author | Laurent Bercot <ska-adelie@skarnet.org> | 2018-08-14 19:52:39 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-adelie@skarnet.org> | 2018-08-15 15:12:16 +0000 |
| commit | afb0fe3ccead10a3a68f938e80c891fe9d9cb9d3 (patch) | |
| tree | b5809b8e852347718303fa2c93a5bc0c2eb07bfc /system/utmps/APKBUILD | |
| parent | cdbdb41c2da9c3185122be33fdef720f7d9f0883 (diff) | |
| download | packages-afb0fe3ccead10a3a68f938e80c891fe9d9cb9d3.tar.gz packages-afb0fe3ccead10a3a68f938e80c891fe9d9cb9d3.tar.bz2 packages-afb0fe3ccead10a3a68f938e80c891fe9d9cb9d3.tar.xz packages-afb0fe3ccead10a3a68f938e80c891fe9d9cb9d3.zip | |
Move s6 higher in the supervision chain
- Better s6 layout, with a place for early services and a
place for packages to add their services later on.
- s6-svscan is now supervised by sysvinit (instead of being
run once by openrc)
- s6-svscan is now the only process supervised by sysvinit.
All the other "respawn" lines are delegated to s6.
- utmpd and wtmpd are now early services instead of being
added by openrc.
These changes implement a full supervision architecture and
make init more flexible. Later on, it will be easier to
- add conditional gettys (for /dev/hvc0...)
- remove sysvinit entirely
- decouple the init process from the service manager.
Diffstat (limited to 'system/utmps/APKBUILD')
| -rw-r--r-- | system/utmps/APKBUILD | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index 01ac5356e..803097314 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot <ska-devel@skarnet.org> pkgname=utmps pkgver=0.0.1.2 -pkgrel=0 +pkgrel=2 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -11,10 +11,9 @@ license="ISC" depends="execline s6" depends_dev="skalibs-dev" makedepends="skalibs-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" -install="$pkgname.pre-install $pkgname.pre-upgrade" +subpackages="$pkgname-dev $pkgname-doc" +install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname.initd utmpd.run wtmpd.run" @@ -33,18 +32,12 @@ build() { package() { cd "$builddir" make DESTDIR="$pkgdir" install - mkdir -p "$pkgdir/etc/init.d" "$pkgdir/var/lib/$pkgname/services/utmpd" "$pkgdir/var/lib/$pkgname/services/wtmpd" - cp -f "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname" - cp -f "$srcdir/utmpd.run" "$pkgdir/var/lib/$pkgname/services/utmpd/run" - echo 3 > "$pkgdir/var/lib/$pkgname/services/utmpd/notification-fd" - s6-mkfifodir -g0 -- "$pkgdir/var/lib/$pkgname/services/utmpd/event" - cp -f "$srcdir/wtmpd.run" "$pkgdir/var/lib/$pkgname/services/wtmpd/run" - echo 3 > "$pkgdir/var/lib/$pkgname/services/wtmpd/notification-fd" - s6-mkfifodir -g 0 -- "$pkgdir/var/lib/$pkgname/services/wtmpd/event" - chmod 0755 "$pkgdir/etc/init.d/$pkgname" "$pkgdir/var/lib/$pkgname/services/utmpd/run" "$pkgdir/var/lib/$pkgname/services/wtmpd/run" - mkdir -m 0700 "$pkgdir/var/lib/$pkgname/services/utmpd/supervise" "$pkgdir/var/lib/$pkgname/services/wtmpd/supervise" - dd if=/dev/zero of="$pkgdir/var/lib/$pkgname/services/utmpd/supervise/status" bs=35 count=1 - dd if=/dev/zero of="$pkgdir/var/lib/$pkgname/services/wtmpd/supervise/status" bs=35 count=1 + mkdir -p -m 0755 "$pkgdir/etc/s6/early-services/utmpd" "$pkgdir/etc/s6/early-services/wtmpd" + cp -f "$srcdir/utmpd.run" "$pkgdir/etc/s6/early-services/utmpd/run" + echo 3 > "$pkgdir/etc/s6/early-services/utmpd/notification-fd" + cp -f "$srcdir/wtmpd.run" "$pkgdir/etc/s6/early-services/wtmpd/run" + echo 3 > "$pkgdir/etc/s6/early-services/wtmpd/notification-fd" + chmod 0755 "$pkgdir/etc/s6/early-services/utmpd/run" "$pkgdir/etc/s6/early-services/wtmpd/run" } doc() { @@ -54,6 +47,5 @@ doc() { } sha512sums="663e9479ad9b684068769c7b2b8c9ac3a4ca46a945a86d909f43d9c19712099ea913b3a87cda5b56b72ec891dbecc2c61b518f985418c45d81d72a5afb366db8 utmps-0.0.1.2.tar.gz -437d0c52ef1ecd23775990225647c2a6ca53691fb5688ffa866a0e6db177a08fe465f2e683e8b98ba668d8ddcd4ffa0fe3939f23ded276f4ca7acaa2553b10e6 utmps.initd -0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run -cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7 wtmpd.run" +525d43e3eced30c564e5390fc715b6caa1ae2b6515a9e3bf01263ff3fb9379bd6908ed302d0d50b6568ac36ed44d272dcc44a683f9ae34d586d8ad17023ed6b1 utmpd.run +93e4fae527ada9381e0b0a7ad5de9079e8d88959abd74fa5c0710c30c6153832abb010b57ddf83055ca34c032e7e5c9c1eedceb2f122a11ab20837ab66dcf5e2 wtmpd.run" |