aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-02-12 05:57:01 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-02-13 21:33:35 -0300
commit0f041eb0acde05e72dcd0be6a08a9c92d5f5b567 (patch)
tree5fdcd7fd7334e930cbfbf587edd1f4dc6e1712b8
parent8ed605d0fc892b9dfc4f242c15a3aed07436dc1e (diff)
downloadaports-0f041eb0acde05e72dcd0be6a08a9c92d5f5b567.tar.bz2
aports-0f041eb0acde05e72dcd0be6a08a9c92d5f5b567.tar.xz
main/openrc: fix priority of modules-load configuration.
The previous configuration loaded in this order: 1. /etc/modules 2. /etc/modules-load.d/*.conf 3. /run/modules-load.d/*.conf 4. /usr/lib/modules-load.d/*.conf 5. /lib/modules-load.d/*.conf This is completely backwards and with this commit it will now be. 1. /lib/modules-load.d/*.conf -> System and base packages configuration 2. /usr/lib/modules-load.d/*.conf -> Other packages configuration 3. /etc/modules -> Local admin configuration 4. /etc/modules-load.d/*.conf -> Local admin configuration (preferred) 5. /run/modules-load.d/*.conf -> Runtime configuration
-rw-r--r--main/openrc/APKBUILD7
-rw-r--r--main/openrc/modules.initd63
2 files changed, 60 insertions, 10 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 00227060a6..319623a69e 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openrc
pkgver=0.42.1
_ver=${pkgver/_git*/}
-pkgrel=2
+pkgrel=3
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="https://github.com/OpenRC/openrc"
arch="all"
@@ -42,8 +42,6 @@ prepare() {
}
build() {
- cd "$builddir"
-
export MKZSHCOMP=yes
export MKBASHCOMP=yes
make LIBEXECDIR=/lib/rc
@@ -52,7 +50,6 @@ build() {
package() {
local i j
- cd "$builddir"
make LIBEXECDIR=/lib/rc DESTDIR="$pkgdir/" install
# we cannot have anything turned on by default
@@ -127,7 +124,7 @@ ff9bf2f6e4f55633a9641385398f70a2e591e2b3b56b1903f168a97b07bd56dc5a65d151deeab942
12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate
493f27d588e64bb2bb542b32493ed05873f4724e8ad1751002982d7b4e07963cfb72f93603b2d678f305177cf9556d408a87b793744c6b7cd46cf9be4b744c02 hostname.initd
c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55 hwdrivers.initd
-b04058ec630e19de0bafefe06198dc1bff8c8d5d2c89e4660dd83dda8bb82a76cdb1d8661cce88e4a406aa6b4152e17efff52d3eb18ffaec0751d0b6cdbcc48a modules.initd
+8f351f1c673d0e3d66aa4e17222963ee3d1da937ee4cb44eeb4e0448bed0e7e99cce74a9705e0ac9760002ca01e6228436393fc989917615d9ba61a5f848fd44 modules.initd
595098085d5a1204e3c5af59bb4a3b3d1fb2980db77925995aa1ec43ef5ae378cef736ddc7924191a99d39c93891d59274fbba08127b15d584c2f82b067ef683 modloop.initd
d21164f4d265456c7633c1f63a296170fcd0d95ca509bbf57c16ac33e4f2e55b840d9e5811f863732040f443ef43d4b9f248d939e273997000556014f114e82e networking.initd
80e43ded522e2d48b876131c7c9997debd43f3790e0985801a8c1dd60bc6e09f625b35a127bf225eb45a65eec7808a50d1c08a5e8abceafc61726211e061e0a2 modloop.confd
diff --git a/main/openrc/modules.initd b/main/openrc/modules.initd
index d90a3e687a..c3abde1eaa 100644
--- a/main/openrc/modules.initd
+++ b/main/openrc/modules.initd
@@ -9,16 +9,69 @@ depend()
}
start() {
+ yesno $rc_verbose && verbose=yes
+
ebegin "Loading modules"
- for f in /etc/modules \
- /etc/modules-load.d/*.conf \
- /run/modules-load.d/*.conf \
- /usr/lib/modules-load.d/*.conf \
- /lib/modules-load.d/*.conf; do
+ echo
+ for f in /lib/modules-load.d/*.conf \
+ /usr/lib/modules-load.d/*.conf; do
+
if ! [ -f "$f" ]; then
continue
fi
+ if [ -f /etc/modules-load.d/"${f##*/}" ]; then
+ veinfo "Ignoring $f due to /etc/modules-load.d/${f##*/}"
+ continue
+ fi
+
+ if [ -f /run/modules-load.d/"${f##*/}" ]; then
+ veinfo "Ignoring $f due to /run/modules-load.d/${f##*/}"
+ continue
+ fi
+
+ veinfo "Processing $f"
+ sed -e 's/\#.*//g' -e '/^[[:space:]]*$/d' < "$f" \
+ | while read module args; do
+ modprobe -q $module $args
+ done
+ done
+
+ for f in /etc/modules; do
+ if [ ! -f "$f" ]; then
+ continue
+ fi
+
+ veinfo "Processing $f"
+ sed -e 's/\#.*//g' -e '/^[[:space:]]*$/d' < "$f" \
+ | while read module args; do
+ modprobe -q $module $args
+ done
+ done
+
+ for f in /etc/modules-load.d/*.conf; do
+ if [ ! -f "$f" ]; then
+ continue
+ fi
+
+ if [ -f /run/modules-load.d/"${f##*/}" ]; then
+ veinfo "Ignoring $f due to /run/modules-load.d/${f##*/}"
+ continue
+ fi
+
+ veinfo "Processing $f"
+ sed -e 's/\#.*//g' -e '/^[[:space:]]*$/d' < "$f" \
+ | while read module args; do
+ modprobe -q $module $args
+ done
+ done
+
+ for f in /run/modules-load.d/*.conf; do
+ if [ ! -f "$f" ]; then
+ continue
+ fi
+
+ veinfo "Processing $f"
sed -e 's/\#.*//g' -e '/^[[:space:]]*$/d' < "$f" \
| while read module args; do
modprobe -q $module $args