Commit 0420e2d4 authored by Natanael Copa's avatar Natanael Copa

main/openrc: modloop: fix detection of vanilla kernel flavor

ref #3672

(cherry picked from commit 34028faf)
parent 77e61d27
......@@ -2,7 +2,7 @@
pkgname=openrc
pkgver=0.12.4
_ver=${pkgver/_git*/}
pkgrel=7
pkgrel=8
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
arch="all"
......@@ -77,7 +77,7 @@ c32e15b0858eef708497e7ee6355a055 hostname.initd
ce3832d8ed5906367ef0f4776b38f3bd hwdrivers.initd
33ca3e558c42cdd17adccbc7807298f7 keymaps.initd
098a1f16812f56fcb56eb6b6f0fa31f6 modules.initd
ca8d2eaa0f2d9397362331e47686963f modloop.initd
704ea7ca3e3cb7d856ca02a72273a127 modloop.initd
55aeca82475cb5a146abff8333bfdf85 networking.initd
c1ec888202d868710b5749f7b217d1e3 modloop.confd"
sha256sums="c4edda2fff4b613f50b9cc265bb457a9ab0170fbc1fe7c26eccd4a5d63b2625c openrc-0.12.4.tar.bz2
......@@ -92,7 +92,7 @@ e91790d23135c43102ea73e5768d4b0d25e9a7d28fca90f1b902aac9c41e1d5c hostname.initd
a71a38309beb6f4718a2ece863659735a5e157a7c927518265e562cd90fc71ff hwdrivers.initd
a6f013c02ca3efb4e29b4844e4d27710cfd319e66157c4fd88a8169e06e7151f keymaps.initd
42f7add323ee77d1ee04d96ed4b52897dd1d2a32ab361fd755d4eb707d67e5be modules.initd
b1f91a9da694d3861cfaa4831e5b21fc682f1e448139b20be516955fe1e7de3b modloop.initd
342cf24a900768d656eaafeafe88d73747646f40c994bb8e5e14e8eb595a560c modloop.initd
dc30c4e0cac37597dda3f97f68aa2f8a5e87a9856de8b2fd08579916117de8ed networking.initd
a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254 modloop.confd"
sha512sums="14e188e382dfe02037d3e4211fa3265152d5ec92ca491b1e86154c0615583ddfc0a2592ca849ab453068dd60000886e57e7da024036fa58d7474acdbb6b92208 openrc-0.12.4.tar.bz2
......@@ -107,6 +107,6 @@ c5b8806c693b0ea48ff87e0e3669304f5c2f95954ad54814889047a933f367081a8c8d3bb771dd1e
932669915d0e4c8b7d23823c6d057d5d3bbc7f2f67532547201fea986c7e3208607d69cfdd41b0b0b1828f33c4e87efb8d65f7a715c33a8c9cdc846b7ec7439b hwdrivers.initd
ee58de9b8608d3f3aa6111b9b43977b91bd2c39bcc3471711812fe740dbc49eee8a7ddd6f2878b90c8eb9bcc5a2f543cb2d82c04f16c263ffad58de7955d8db5 keymaps.initd
103889e4e183105b87052ead50747358c5cb17627f93c83b84434f9e615f8cad3ae554fb78e1f9f4c634265313d7ae11fe3760a5c97a5d8b4ddf48aa2b489be7 modules.initd
d0e8786e870e1798181f89d5f9210f67f3eaa4b42aa4da321220bd6abd4f722e6775218720026f5dc419f36eacc8349ddcfb51adc1788d42d586880cd1271aa3 modloop.initd
1f4b460aa8fc142c841948b42a6ba690241991320b7ceecbb83203a0329760667f7494784e70b1ed4c55d9df7cc2f601f2a4bfcadb28b3cdd38db520c854c392 modloop.initd
b46b34d96ba01aa7d19cae12560fbb2724762223fb5717b9d8d8c46c09dbc35829b9626c96cc08b9388614baa990e2fb526aab12c44667851731cae949bded1a networking.initd
aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689 modloop.confd"
......@@ -96,7 +96,11 @@ start() {
bootimagedir=${KOPT_BOOT_IMAGE%/*}
bootdir=${alpine_mnt}${bootimagedir}
kver=$(uname -r)
kflavor=${kver##*-}
case $kver in
*-rc[0-9]) kflavor=vanilla;;
*-[a-z]*) kflavor=${kver##*-};;
*) kflavor=vanilla;;
esac
for modloop in ${alpine_mnt}$KOPT_modloop \
${bootdir}/modloop-$kver \
${bootdir}/modloop-$kflavor \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment