Skip to content

Commit

Permalink
Remove localmount from dependencies for linux-only services
Browse files Browse the repository at this point in the history
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
  • Loading branch information
williamh committed May 7, 2018
1 parent 0200002 commit a3d0e29
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
7 changes: 7 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion init.d/consolefont.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion init.d/keymaps.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 0 additions & 1 deletion init.d/numlock.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}

depend()
{
need localmount
keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
}

Expand Down
1 change: 0 additions & 1 deletion init.d/procfs.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ depend()
after clock
use devfs
want modules
need localmount
keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
}

Expand Down

0 comments on commit a3d0e29

Please sign in to comment.