From a3d0e293eebcb92564c473e61ca42724844fb279 Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Mon, 7 May 2018 18:12:55 -0500
Subject: [PATCH] Remove localmount from dependencies for linux-only services

This removes localmount from the dependencies of the consolefont,
keymaps, numlock and procfs services.

These services are Linux only and the default modern linux system has /
and /usr on the same file system.

This also fixes the following issue.

X-Gentoo-Bug: 651998
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=651998
---
 NEWS.md               | 7 +++++++
 init.d/consolefont.in | 2 +-
 init.d/keymaps.in     | 2 +-
 init.d/numlock.in     | 1 -
 init.d/procfs.in      | 1 -
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index f7849093..328247da 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -11,6 +11,13 @@ modules service since there is no reason I know of to keep them
 separate. However, modules also provides modules-load in case you were
 using modules-load in  your dependencies.
 
+The consolefont, keymaps, numlock and procfs service scripts no longer
+have a dependency on localmount.
+If you are a linux user and are still separaating / from /usr,
+you will need to add the following line to the appropriate conf.d files:
+
+rc_need="localmount"
+
 ## OpenRC 0.35
 
 In this version, the cgroups mounting logic has been moved from the
diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index 9fe95afa..d65dd14c 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -13,7 +13,7 @@ description="Sets a font for the consoles."
 
 depend()
 {
-	need localmount termencoding
+	need termencoding
 	after hotplug bootmisc modules
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index 2cc8a39f..4bece821 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -13,7 +13,7 @@ description="Applies a keymap for the consoles."
 
 depend()
 {
-	need localmount termencoding
+	need termencoding
 	after bootmisc clock
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
diff --git a/init.d/numlock.in b/init.d/numlock.in
index 875ffc09..6c33c95f 100644
--- a/init.d/numlock.in
+++ b/init.d/numlock.in
@@ -15,7 +15,6 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
-	need localmount
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
diff --git a/init.d/procfs.in b/init.d/procfs.in
index 8fed9514..edc8ee19 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -16,7 +16,6 @@ depend()
 	after clock
 	use devfs
 	want modules
-	need localmount
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }