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 /main/openrc/modloop.initd | |
| 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
Diffstat (limited to 'main/openrc/modloop.initd')
| -rw-r--r-- | main/openrc/modloop.initd | 10 |
1 files changed, 9 insertions, 1 deletions
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 |