aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-03-01 13:41:24 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-03-01 13:41:24 +0000
commited0139df75058085871d0ee8bf930642a0503889 (patch)
tree90d790d3a91ab596ab4aab4ca40ce09afb8369c0
parentd6e6ec28795dce2612bc66be94b44daef10758ef (diff)
downloadaports-ed0139df75058085871d0ee8bf930642a0503889.tar.bz2
aports-ed0139df75058085871d0ee8bf930642a0503889.tar.xz
main/openrc: modloop: fixes for syslinux-5
-rw-r--r--main/openrc/APKBUILD30
-rw-r--r--main/openrc/modloop.initd11
2 files changed, 34 insertions, 7 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index fcc31f2f45..1e6a69ba1c 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openrc
pkgver=0.10.5
_ver=${pkgver/_git*/}
-pkgrel=8
+pkgrel=9
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
arch="all"
@@ -73,6 +73,32 @@ c32e15b0858eef708497e7ee6355a055 hostname.initd
ce3832d8ed5906367ef0f4776b38f3bd hwdrivers.initd
33ca3e558c42cdd17adccbc7807298f7 keymaps.initd
098a1f16812f56fcb56eb6b6f0fa31f6 modules.initd
-d10c4fd412faf0b970bb470f493fe718 modloop.initd
+ea3a284e4ef4bfd4b902421062173ff9 modloop.initd
55aeca82475cb5a146abff8333bfdf85 networking.initd
c1ec888202d868710b5749f7b217d1e3 modloop.confd"
+sha256sums="27677142a7aa47a1c7e863fd4bce0d092aca7870012812e4f7a690a14f1e242c openrc-0.10.5.tar.bz2
+c807aed11d7eb42de5c421a6d117532f6215697f159f40cb3404bdc80270bee1 openrc-0.4.3-mkmntdirs.patch
+e869e2076c10a7134f5d9e4ae4a5d09ca35c6333d400556f1e329170d2e58066 0001-Force-root-be-rw-before-localmount.patch
+84d67ed2cf050e20f52d4ea048e7452e78356ba02b396d8c064a4458c0811ea4 swap-umount-tmpfs.patch
+8978b00492d90b573f5254cc394582e8f1a5cd8b4d6c928fa0a9a022dd17fe9c swap-ifexists.patch
+0e527b58f4ba325a853fccb58e7fab99a31335eee59d01856e4d1f103db8c581 rc-sys-lxc.patch
+e91790d23135c43102ea73e5768d4b0d25e9a7d28fca90f1b902aac9c41e1d5c hostname.initd
+a71a38309beb6f4718a2ece863659735a5e157a7c927518265e562cd90fc71ff hwdrivers.initd
+a6f013c02ca3efb4e29b4844e4d27710cfd319e66157c4fd88a8169e06e7151f keymaps.initd
+42f7add323ee77d1ee04d96ed4b52897dd1d2a32ab361fd755d4eb707d67e5be modules.initd
+46626e49a15d670eb2485994b278c05f90d4cde4be0023ed0aac1932e17d137c modloop.initd
+dc30c4e0cac37597dda3f97f68aa2f8a5e87a9856de8b2fd08579916117de8ed networking.initd
+a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254 modloop.confd"
+sha512sums="f855d5f1b115cc4387585b9533fba78d22b7c54379a26e3d26995c1ff5b3bbe11bb6e6adc715d35710fcff77449d23bcdbbd4fbb5ea74e66a2ba224dfe2746e3 openrc-0.10.5.tar.bz2
+eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5ccc08455268003ca2917b2bff31adc9894214221c469a97db openrc-0.4.3-mkmntdirs.patch
+51c77be5ab726d50ef1d0b9dab644edef1ff739e855e3a12ab27beada8911998e0c6a7491eb92df621dcdb633b672d933a4edc00115ec43bdf1271105239ebb7 0001-Force-root-be-rw-before-localmount.patch
+8fd442d372401740b1c523367c928f49efa8179604aac2b517cdc4264daf303056d5a5e0a2c996db5e6ef9b7cdd0619a16cfabc15c3399e322384844e2a36542 swap-umount-tmpfs.patch
+c5b8806c693b0ea48ff87e0e3669304f5c2f95954ad54814889047a933f367081a8c8d3bb771dd1ed6c3bc845df894232bd6b662066d09eba3abf3964187d1d1 swap-ifexists.patch
+31dd91ed667b053766693943b31645c4236681b786108a1aa27f3acf86402feb273f2d66352a840e3afa10deb64b165edc4fe9f93ac9b58d3b45fc28222707b0 rc-sys-lxc.patch
+6de80fd9ff9692bb15aa0a90255beea939a4f79b4fdff9fdf443d85bf168c162183efa44d7769af855f9c2460c77f29df19037eca09156ac42dd01fba7be9934 hostname.initd
+932669915d0e4c8b7d23823c6d057d5d3bbc7f2f67532547201fea986c7e3208607d69cfdd41b0b0b1828f33c4e87efb8d65f7a715c33a8c9cdc846b7ec7439b hwdrivers.initd
+ee58de9b8608d3f3aa6111b9b43977b91bd2c39bcc3471711812fe740dbc49eee8a7ddd6f2878b90c8eb9bcc5a2f543cb2d82c04f16c263ffad58de7955d8db5 keymaps.initd
+103889e4e183105b87052ead50747358c5cb17627f93c83b84434f9e615f8cad3ae554fb78e1f9f4c634265313d7ae11fe3760a5c97a5d8b4ddf48aa2b489be7 modules.initd
+b5bfbc779286410639244c9bbcdbe937f7f4f2d7582b424dd22e38123cc0507b5e70c83d69f4aae0659d690c0cb4a35ee834c71236c0dd0a9c181eaf060f785e modloop.initd
+b46b34d96ba01aa7d19cae12560fbb2724762223fb5717b9d8d8c46c09dbc35829b9626c96cc08b9388614baa990e2fb526aab12c44667851731cae949bded1a networking.initd
+aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689 modloop.confd"
diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd
index 97a45cc19a..11e8089700 100644
--- a/main/openrc/modloop.initd
+++ b/main/openrc/modloop.initd
@@ -11,12 +11,13 @@ depend() {
# read kernel options
init_KOPT() {
eval set -- $(cat /proc/cmdline 2>/dev/null)
- while [ $# -gt 0 ]; do
- case "$1" in
- *=*) eval "KOPT_${1%%=*}='${1#*=}'" ;;
- *) eval "KOPT_$(echo $1 | sed 's: :_:g')=yes" ;;
+ # in case syslinux does not set BOOT_IMAGE
+ KOPT_BOOT_IMAGE="${1}"
+ for opt; do
+ case "$opt" in
+ alpine_dev=*|modloop=*|BOOT_IMAGE=*)
+ eval "KOPT_${opt%%=*}='${opt#*=}'" ;;
esac
- shift
done
}