From 54d8b12cfe5b6028b5e1152ba1627878d3657a6b Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Sun, 19 Aug 2018 21:31:04 +0000
Subject:  system/gettys-openrc: new package. Move all getty definitions to it.

 Small change to system/adelie-base so it includes gettys-openrc.
 Small change to system/s6 so it doesn't statically define gettys.
---
 system/s6/APKBUILD       | 18 ++++--------------
 system/s6/agetty-run     |  2 --
 system/s6/s6.pre-install |  6 ------
 system/s6/s6.pre-upgrade |  6 ------
 4 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 system/s6/agetty-run
 delete mode 100644 system/s6/s6.pre-install
 delete mode 100644 system/s6/s6.pre-upgrade

(limited to 'system/s6')

diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index a08220a3e..658a0d7ed 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6
 pkgver=2.7.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="skarnet.org's small & secure supervision software suite"
 url="https://skarnet.org/software/$pkgname/"
 arch="all"
@@ -10,11 +10,11 @@ options="!check"  # No test suite.
 license="ISC"
 depends_dev="skalibs-dev execline-dev"
 makedepends="skalibs-dev>=2.7 execline-dev"
-install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade"
+install="$pkgname.post-upgrade"
 subpackages="$pkgname-dev $pkgname-doc"
 triggers="$pkgname.trigger=/run/service"
 source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
-	s6-svscanboot agetty-run"
+	s6-svscanboot"
 
 
 build() {
@@ -35,15 +35,6 @@ package() {
         cp -f "$srcdir/s6-svscanboot" "$pkgdir/lib/s6/s6-svscanboot"
 	mkdir -p -m 0755 "$pkgdir/etc/s6/early-services" "$pkgdir/var/lib/s6/services"
         chmod 0755 "$pkgdir/lib/s6/s6-svscanboot"
-
-
-	# The getty scripts are created here
-
-	for i in 1 2 3 4 5 6 ; do
-		mkdir -m 0755 "$pkgdir/etc/s6/early-services/getty-$i"
-		sed -e "s/%TTY%/tty$i/g" < "$srcdir/agetty-run" > "$pkgdir/etc/s6/early-services/getty-$i/run"
-		chmod 0755 "$pkgdir/etc/s6/early-services/getty-$i/run"
-	done
 }
 
 doc() {
@@ -53,5 +44,4 @@ doc() {
 }
 
 sha512sums="0ab98c44324054effa0754efd117b3126a53fac7096979aacffd7d86128c5cb1f714205e30ca4e561ca3740646d1f36eb53b9e30d139d7ce4dc1b8cfb3e33123  s6-2.7.2.0.tar.gz
-bad19965aa8ea138cdf5688db9ae05fc7ce2111ac0945b5b0e78cda55ad290602f28ac8b52aae395ca5e857f32e9be4d6df882286b362ba7008a52b29472ff1e  s6-svscanboot
-fb60b841da03583ba9f0f0541b45e4cf88fa5311b26376042e951317428dcaa6c81bb6c739c7a442ef0d36e1581a29cb9c4fb2d87411268fb23a033130fc8051  agetty-run"
+bad19965aa8ea138cdf5688db9ae05fc7ce2111ac0945b5b0e78cda55ad290602f28ac8b52aae395ca5e857f32e9be4d6df882286b362ba7008a52b29472ff1e  s6-svscanboot"
diff --git a/system/s6/agetty-run b/system/s6/agetty-run
deleted file mode 100644
index 79884efc7..000000000
--- a/system/s6/agetty-run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/execlineb -P
-/sbin/agetty 38400 %TTY% linux
diff --git a/system/s6/s6.pre-install b/system/s6/s6.pre-install
deleted file mode 100644
index 2c175a325..000000000
--- a/system/s6/s6.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S catchlog 2>/dev/null
-adduser -S -D -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null
-
-exit 0
diff --git a/system/s6/s6.pre-upgrade b/system/s6/s6.pre-upgrade
deleted file mode 100644
index 2c175a325..000000000
--- a/system/s6/s6.pre-upgrade
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S catchlog 2>/dev/null
-adduser -S -D -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null
-
-exit 0
-- 
cgit v1.2.3-60-g2f50