From d0273d93d561bb040de00599ce46f5523cd6fbab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Mon, 19 Feb 2018 16:44:19 +0100
Subject: main/openrc: make keymaps a virtual service

---
 main/openrc/APKBUILD       |  9 +++++++--
 main/openrc/keymaps.initd  | 20 --------------------
 main/openrc/loadkmap.initd | 21 +++++++++++++++++++++
 3 files changed, 28 insertions(+), 22 deletions(-)
 delete mode 100644 main/openrc/keymaps.initd
 create mode 100644 main/openrc/loadkmap.initd

diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index d7059c8552..150eeaa191 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -25,7 +25,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
 	openrc.logrotate
 	hostname.initd
 	hwdrivers.initd
-	keymaps.initd
+	loadkmap.initd
 	modules.initd
 	modloop.initd
 	networking.initd
@@ -66,6 +66,11 @@ package() {
 		install -Dm644 $i "$pkgdir"/etc/conf.d/${j%.confd}
 	done
 
+	# we use a virtual keymaps services to allow users to set their
+	# keymaps either with kbd or busyboxs loadkmap applet.
+	rm -f "$pkgdir/etc/init.d/keymaps"
+	mv "$pkgdir/etc/conf.d/keymaps" "$pkgdir/etc/conf.d/loadkmap"
+
 	install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
 	install -d "$pkgdir"/etc/local.d "$pkgdir"/run
 }
@@ -82,7 +87,7 @@ dbe3f170440f0f357f31ac4d49c56a9a7ec22172df2701bf4a0afdee22aedda1f88b9fa5ffdbe19a
 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec  openrc.logrotate
 99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd  hostname.initd
 c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55  hwdrivers.initd
-584ecbbcecb284527d7616790b6e337ace610e4b3cedf2993eca294bfbef54674aeaee3078b6c17d746a0c48b5a64a813c3534136915947e6f62a6fa206cd3ca  keymaps.initd
+1b61a0f1eb40f2ea14bf3ed3441996f343d70fd45858d443f21244f133dcdf1c64433c3deaef769eee4e3e698b405f25e1bbc185a25c351a88ce7d120d61cf00  loadkmap.initd
 b04058ec630e19de0bafefe06198dc1bff8c8d5d2c89e4660dd83dda8bb82a76cdb1d8661cce88e4a406aa6b4152e17efff52d3eb18ffaec0751d0b6cdbcc48a  modules.initd
 27c036a2c07f658f7fb1e066c59dc494674ba0d81bcb85fea9caffec28ee537eb11e863e20aa4b1c88607f12496ac66d5b092c787c86ff8b8a80e423a8d99440  modloop.initd
 55df0ac13dac1f215f0c573ac07b150d31232a5204eccfc8941d5af73f91b4535a85d79b7f6514217038ecbe6bffa28cb83fd8d46fd4c596e07103deb8bc8a57  networking.initd
diff --git a/main/openrc/keymaps.initd b/main/openrc/keymaps.initd
deleted file mode 100644
index 24d1e87778..0000000000
--- a/main/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
-}
diff --git a/main/openrc/loadkmap.initd b/main/openrc/loadkmap.initd
new file mode 100644
index 0000000000..7149dd729e
--- /dev/null
+++ b/main/openrc/loadkmap.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+
+description="Applies a keymap for the consoles."
+
+depend()
+{
+	provide keymaps
+	need localmount
+	keyword -openvz -prefix -uml -vserver -xenu -lxc
+}
+
+start() {
+	[ -z "$KEYMAP" ] && return
+	ebegin "Setting keymap"
+	zcat "$KEYMAP" | loadkmap
+	eend $?
+}
+
+stop() {
+	return
+}
-- 
cgit v1.2.3