main/openrc: fix sysctl init.c script

busybox sysctl only accept one file so we need to re-run it for each
config file.

(cherry picked from commit e24406612af6110fe7e2c881a6532c725dfb249e)

2 files changed, 19 insertions, 13 deletions

diff --git a/main/openrc/0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch b/main/openrc/0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
index b029352985..0814876a3a 100644
--- a/main/openrc/0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
+++ b/main/openrc/0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
@@ -1,22 +1,28 @@
-From 01dba03704574dda2c43ec3a0609144a8c03c641 Mon Sep 17 00:00:00 2001
+From cc347f6ddacb3c4f1bfc87b274fef1fd7924a539 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
 Date: Tue, 28 Apr 2015 12:26:46 +0200
 Subject: [PATCH] sysctl.Linux.in: fix for busybox sysctl
 
 busybox sysctl does not support --system
 ---
- init.d/sysctl.Linux.in | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
+ init.d/sysctl.Linux.in | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
-index 1defcec..2371b29 100644
+index 186c6ed..ff17892 100644
 --- a/init.d/sysctl.Linux.in
 +++ b/init.d/sysctl.Linux.in
-@@ -14,6 +14,17 @@ start()
+@@ -10,10 +10,21 @@ depend()
+ 
+ start()
+ {
+-       local quiet
++       local quiet rc=0
         yesno $rc_verbose || quiet=-q
  
         ebegin "Configuring kernel parameters"
 -       sysctl ${quiet} --system
+-       eend $? "Unable to configure some kernel parameters"
 +       set --
 +       for i in /run/sysctl.d/*.conf \
 +                       /etc/sysctl.d/*.conf \
@@ -25,12 +31,12 @@ index 1defcec..2371b29 100644
 +                       /lib/sysctl.d/*.conf \
 +                       /etc/sysctl.conf; do
 +               if [ -e "$i" ]; then
-+                       set -- "$@" "$i"
++                       sysctl ${quiet} -p "$i"
++                       rc=$(( $rc + $? ))
 +               fi
 +       done
-+       sysctl ${quiet} -p "$@"
-        eend $? "Unable to configure some kernel parameters"
++       eend $rc "Unable to configure some kernel parameters"
  }
 -- 
-2.3.6
+2.4.5
 
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 75f3d9127e..e877d39edf 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openrc
 pkgver=0.15.1
 _ver=${pkgver/_git*/}
-pkgrel=2
+pkgrel=3
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
 arch="all"
@@ -69,7 +69,7 @@ package() {
 md5sums="cf0d21a8d84696a98d15779a0a3e3b46  openrc-0.15.1.tar.gz
 8c2c1c2ee0509b63966b7187a2079f4b  openrc-0.4.3-mkmntdirs.patch
 4fd036ff07ed9ad7fb76af6a3ffc0695  0001-Force-root-be-rw-before-localmount.patch
-f78b02ad9e4f211eb4740a1d6ddfb7ee  0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
+f5bcedf55f440767a0b93d9f9cd2860d  0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
 c2af5e52da614a6cef02d1e4d537e360  swap-umount-tmpfs.patch
 1c426b84d13a725ad493647b5253f239  swap-ifexists.patch
 679c559aa54f9e855cd735866eeaaad6  hide-migrate-to-run-error.patch
@@ -84,7 +84,7 @@ c1ec888202d868710b5749f7b217d1e3  modloop.confd"
 sha256sums="2ad5855253d9abaf6764bb8dea6d19b1578759f9da74ca562ebabf568762df33  openrc-0.15.1.tar.gz
 c807aed11d7eb42de5c421a6d117532f6215697f159f40cb3404bdc80270bee1  openrc-0.4.3-mkmntdirs.patch
 e869e2076c10a7134f5d9e4ae4a5d09ca35c6333d400556f1e329170d2e58066  0001-Force-root-be-rw-before-localmount.patch
-01ad638b4f2251f617fc5704e0eb3ffcbe286de3e5db003b7862d56c423a6e09  0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
+bdccc12593d9bb9df6fcff57a56e4100ae43e052d6eff87f561966653ca071dc  0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
 84d67ed2cf050e20f52d4ea048e7452e78356ba02b396d8c064a4458c0811ea4  swap-umount-tmpfs.patch
 8978b00492d90b573f5254cc394582e8f1a5cd8b4d6c928fa0a9a022dd17fe9c  swap-ifexists.patch
 786580df90a5a75087e5adfd395d160dee2df4b994e0938e8524198aeaf2d774  hide-migrate-to-run-error.patch
@@ -99,7 +99,7 @@ a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254  modloop.confd"
 sha512sums="818b2204d9ee27794c8dda31421c27a1cba01e26ae2530b4e12808c8fe0bab93a805d2beb6aca957a0d75d6089022cc2dc59beaee8e678390a41e600c05f2207  openrc-0.15.1.tar.gz
 eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5ccc08455268003ca2917b2bff31adc9894214221c469a97db  openrc-0.4.3-mkmntdirs.patch
 51c77be5ab726d50ef1d0b9dab644edef1ff739e855e3a12ab27beada8911998e0c6a7491eb92df621dcdb633b672d933a4edc00115ec43bdf1271105239ebb7  0001-Force-root-be-rw-before-localmount.patch
-2df870406f8bead5adafcdcff4dde04e8e3bf2a378c507a184bbcfecc563e9ef7fceca065b88ac77c5dabe6a2d3d4386a480c5a5cf80031593c4f6891976806b  0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
+1c01874aebab74c18c70c1869b074ce1069ac43637340097e4f16741bd6b4771bc9506b25482f10e2b597f73ad2ea57434acb61ed38fca72017aed96b13e45fa  0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
 8fd442d372401740b1c523367c928f49efa8179604aac2b517cdc4264daf303056d5a5e0a2c996db5e6ef9b7cdd0619a16cfabc15c3399e322384844e2a36542  swap-umount-tmpfs.patch
 c5b8806c693b0ea48ff87e0e3669304f5c2f95954ad54814889047a933f367081a8c8d3bb771dd1ed6c3bc845df894232bd6b662066d09eba3abf3964187d1d1  swap-ifexists.patch
 750e3305913d3f6fa6baa0b34b851fe17aacb922e864b95ec9b4b451e8e3c16d0c10686a12f4c7cb9b5d05894e1d89b0dac3beed19b1223d3fbc672f25769145  hide-migrate-to-run-error.patch