diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-26 13:26:46 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-26 13:32:44 +0000 |
| commit | a9e41e4df2ce32c78f2f255fb5ab25a4f5ace671 (patch) | |
| tree | a56586b39d9f2cdf0138aa49d0ef18dc4ad16e16 | |
| parent | 9c0d90b629e55a0b570832e1ea17e5cf032c4527 (diff) | |
| download | aports-a9e41e4df2ce32c78f2f255fb5ab25a4f5ace671.tar.bz2 aports-a9e41e4df2ce32c78f2f255fb5ab25a4f5ace671.tar.xz | |
main/openrc: extend search for modloop image
we now also search for:
modloop-$kver
modloop-$kflavor
modloop
| -rw-r--r-- | main/openrc/APKBUILD | 8 | ||||
| -rw-r--r-- | main/openrc/modloop.initd | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index c1e8fabb7e..c049b3bac9 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -2,7 +2,7 @@ pkgname=openrc pkgver=0.12.4 _ver=${pkgver/_git*/} -pkgrel=5 +pkgrel=6 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 -1be014fc82f77ddf5d862d05d3cddf9f modloop.initd +5d5c384ed7e51558e00fa5fa0e78e19a 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 -b7488bfd8f5c2a6dd741ef815055c949b4acf55ddf27d9e69661cb9e7669f945 modloop.initd +38b90cd5949fbef2a608cb97cdf7fe94d9b9cbc067a70e07d7b55e02f8d26524 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 -41c4689ab023d830fe440faa89fd8c89c88c18b17769a32ba0f00d2784325e74893b86e1453dd24467dc122b5d9f8906a6d995d34aedd149f3f7d32e9cb21051 modloop.initd +9f636620b6cb144cf04714bc2b12adc269a6438fd5b9984c72f2e60a625dd9170f95fedf35bc145a5e5b85d24149c6f1cd904a54a5af9081aa0a89fe5fcb82b6 modloop.initd b46b34d96ba01aa7d19cae12560fbb2724762223fb5717b9d8d8c46c09dbc35829b9626c96cc08b9388614baa990e2fb526aab12c44667851731cae949bded1a networking.initd aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689 modloop.confd" diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd index 3ebb018468..f10713c697 100644 --- a/main/openrc/modloop.initd +++ b/main/openrc/modloop.initd @@ -5,7 +5,7 @@ depend() { need dev before checkfs fsck hwdrivers modules hwclock - keyword novserver + keyword novserver nolxc } # read kernel options @@ -92,7 +92,15 @@ start() { mount $mount_opts /dev/$alpine_dev $alpine_mnt 2>/dev/null eend $? || return 1 fi + + bootimagedir=${KOPT_BOOT_IMAGE%/*} + bootdir=${alpine_mnt}${bootimagedir:-/boot} + kver=$(uname -r) + kflavor=${kver##*-} for modloop in ${alpine_mnt}$KOPT_modloop \ + ${bootdir}/modloop-$kver \ + ${bootdir}/modloop-$kflavor \ + ${bootdir}/modloop \ ${alpine_mnt}$KOPT_BOOT_IMAGE.modloop.*; do [ -f "$modloop" -o -n "$KOPT_modloop" ] && break |