aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-08-12 15:29:24 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-08-12 15:29:24 +0200
commitd6c52bdeb78fb714ae375c2dc50e4695698f0054 (patch)
treeddfcfbb3d8f0ae7407bc78d41cc9cc8b2f690734
parentc0a91b6cb3be3683c5856720db2068a799122cb4 (diff)
downloadaports-d6c52bdeb78fb714ae375c2dc50e4695698f0054.tar.gz
aports-d6c52bdeb78fb714ae375c2dc50e4695698f0054.tar.bz2
aports-d6c52bdeb78fb714ae375c2dc50e4695698f0054.tar.xz
main/openrc: fix sysfsconf load order
the directory is so packages can ship config. User may want override those in the config file so we let the config file win. This is also consistent with sysctl.
-rw-r--r--main/openrc/APKBUILD8
-rw-r--r--main/openrc/sysfsconf.initd2
2 files changed, 5 insertions, 5 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index d58b0bdebb..00b3b6b6c1 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openrc
pkgver=0.21
_ver=${pkgver/_git*/}
-pkgrel=1
+pkgrel=2
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
arch="all"
@@ -96,7 +96,7 @@ d83df5513f08f09fa9e7353327701bf7 openrc.logrotate
c1ec888202d868710b5749f7b217d1e3 modloop.confd
bd51c5353d6dbbb34d929bf59097b232 consolefont.initd
1c629807d282ca1dc73ffe55c29146ef consolefont.confd
-443f231c3e866981b8916a821dd51e90 sysfsconf.initd"
+8a49d8ae0ec6502d0b5ddb568e73138d sysfsconf.initd"
sha256sums="65e83e8b5c2f4316a827e49f4c3da7d98cf02f62b37d6a15d636bb8b9cf5a6e4 openrc-0.21.tar.gz
c807aed11d7eb42de5c421a6d117532f6215697f159f40cb3404bdc80270bee1 openrc-0.4.3-mkmntdirs.patch
e869e2076c10a7134f5d9e4ae4a5d09ca35c6333d400556f1e329170d2e58066 0001-Force-root-be-rw-before-localmount.patch
@@ -116,7 +116,7 @@ e92994dfd5ad6b099eca7627e36dbbe1107c5862b46722c1e1e1b13d10276b60 modloop.initd
a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254 modloop.confd
8a3f663e9ac14f62c3aef4121736a71edd676bdc9dd93c1d411f13a0e7ab4ee6 consolefont.initd
9010b94892280f0bb42be39c0e989a70439eb97cbfe2a7a41a32df9a3035b8c2 consolefont.confd
-4f5a5bebf4361e0db84546910231a61f824a8ea38325bd88b1adadec48f2338d sysfsconf.initd"
+63e7b8c3118612d250f55a711c3e8f0fd328ddd54464e50d0425496cc580beb4 sysfsconf.initd"
sha512sums="a52669b5b54550b8fd442438d9e684af1dc3d365be28ce8aae588eb93a2270ee474773baaabbb4b2a879320dc182b99f10862fefe41c28ceac4e26f188f0b01e openrc-0.21.tar.gz
eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5ccc08455268003ca2917b2bff31adc9894214221c469a97db openrc-0.4.3-mkmntdirs.patch
51c77be5ab726d50ef1d0b9dab644edef1ff739e855e3a12ab27beada8911998e0c6a7491eb92df621dcdb633b672d933a4edc00115ec43bdf1271105239ebb7 0001-Force-root-be-rw-before-localmount.patch
@@ -136,4 +136,4 @@ c4de2292b5a175f082f4f80de5145746e4d97481fccb1d22f3a637e46c7c986ad4cd363cb1096312
aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689 modloop.confd
c8d52d69692a00862cd55719174d7a260d5149f4951dd71196f5e9cebce3a75420a8815f0fe8b186d00b4d46739dc54542dae01a941605fcb1435f4385e444b7 consolefont.initd
260fb9500cf59ad00006086b80d463b5557c4779eb6683966a570471d302ec00325acedabf542a70f7f4bda7b5d813b51128b46d75e0c01f78223c68b3c75260 consolefont.confd
-795bf842ee223d97cf803eb280de73be3742bf1b32586446b0df0caeddbdde7fa7d6512f81f16191522fd7d55da54dd5485a801d267b8724fa363d950f0e168d sysfsconf.initd"
+d76c75c58e6f4b0801edac4e081b725ef3d50a9a8c9bbb5692bf4d0f804af7d383bf71a73d5d03ed348a89741ef0b2427eb6a7cbf5a9b9ff60a240639fa6ec88 sysfsconf.initd"
diff --git a/main/openrc/sysfsconf.initd b/main/openrc/sysfsconf.initd
index cefc3595dd..433e51d639 100644
--- a/main/openrc/sysfsconf.initd
+++ b/main/openrc/sysfsconf.initd
@@ -56,7 +56,7 @@ load_conffile() {
start() {
[ -r "$conffile" -o -d "$confdir" ] || return 0
ebegin "Setting sysfs variables"
- for file in $conffile $confdir/*.conf; do
+ for file in $confdir/*.conf $conffile; do
[ -r "$file" ] || continue
load_conffile "$file" || return 1
done