summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-06-03 00:10:34 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-06-03 00:10:34 +0000
commitb92896ea3ce6fb0896a42475dee2fc8a36a642cd (patch)
treeaf60da877982410ba7f9dadcb6d3921439a91ae3
parent4e4e81b98f4001f13b1690e31d8b155cbe0aa3d5 (diff)
downloadpackages-b92896ea3ce6fb0896a42475dee2fc8a36a642cd.tar.gz
packages-b92896ea3ce6fb0896a42475dee2fc8a36a642cd.tar.bz2
packages-b92896ea3ce6fb0896a42475dee2fc8a36a642cd.tar.xz
packages-b92896ea3ce6fb0896a42475dee2fc8a36a642cd.zip
system/openrc; remove services we provide elseway (fixes #101)
-rw-r--r--system/openrc/APKBUILD11
-rw-r--r--system/openrc/keymaps.initd20
2 files changed, 8 insertions, 23 deletions
diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD
index d48ee52f6..fcec2abeb 100644
--- a/system/openrc/APKBUILD
+++ b/system/openrc/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openrc
pkgver=0.24.1
_ver=${pkgver/_git*/}
-pkgrel=6
+pkgrel=7
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="https://github.com/OpenRC/openrc"
arch="all"
@@ -27,7 +27,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
openrc.logrotate
hostname.initd
hwdrivers.initd
- keymaps.initd
modules.initd
modloop.initd
modloop.confd
@@ -73,6 +72,13 @@ package() {
# we do not use their default networking stuff
rm "$pkgdir"/etc/conf.d/network
+ rm "$pkgdir"/etc/init.d/network
+
+ # we use console-setup for keymaps
+ rm "$pkgdir"/etc/init.d/keymaps
+
+ # we use gettys-openrc for TTY
+ rm "$pkgdir"/etc/init.d/agetty
install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
install -d "$pkgdir"/etc/local.d "$pkgdir"/run
@@ -90,7 +96,6 @@ d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc
12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate
99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd hostname.initd
c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55 hwdrivers.initd
-584ecbbcecb284527d7616790b6e337ace610e4b3cedf2993eca294bfbef54674aeaee3078b6c17d746a0c48b5a64a813c3534136915947e6f62a6fa206cd3ca keymaps.initd
b04058ec630e19de0bafefe06198dc1bff8c8d5d2c89e4660dd83dda8bb82a76cdb1d8661cce88e4a406aa6b4152e17efff52d3eb18ffaec0751d0b6cdbcc48a modules.initd
92c0245ba4d7cc6828a9b68510fb541cf3b21b9b844a858336af60e84d1db62ddb4471aad0d82ef05d639335a81014f8350a71a746c2bcd90697daa6a8c03408 modloop.initd
aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689 modloop.confd
diff --git a/system/openrc/keymaps.initd b/system/openrc/keymaps.initd
deleted file mode 100644
index 24d1e8777..000000000
--- a/system/openrc/keymaps.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-
-description="Applies a keymap for the consoles."
-
-depend()
-{
- need localmount
- keyword -openvz -prefix -uml -vserver -xenu -lxc
-}
-
-start() {
- [ -z "$KEYMAP" ] && return
- ebegin "Setting keymap"
- zcat "$KEYMAP" | loadkmap
- eend $?
-}
-
-stop() {
- return
-}