aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2016-10-20 13:10:23 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2016-10-20 17:43:12 +0300
commitf006465dd284560e59eef562158a9ff5a035aba4 (patch)
treec47152cbf60c22cadda115bab0163228e311a2c2
parent14361e7589675a8032485780173e1cc71de2132f (diff)
downloadmkinitfs-f006465dd284560e59eef562158a9ff5a035aba4.tar.bz2
mkinitfs-f006465dd284560e59eef562158a9ff5a035aba4.tar.xz
init: make network boot work without apkovl
-rwxr-xr-xinitramfs-init.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/initramfs-init.in b/initramfs-init.in
index 8b5ca40..1a1adab 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -169,7 +169,7 @@ ip_set() {
# "server-ip" and "hostname" are not supported here.
#
configure_ip() {
- [ -n "$KOPT_ip" ] || return
+ [ -z "$KOPT_ip" -o "$MAC_ADDRESS" ] && return
OIFS=$IFS
IFS=':'
eval set -- $KOPT_ip
@@ -527,6 +527,9 @@ cp -a /etc/apk/keys $sysroot/etc/apk
# generate apk repositories file. needs to be done after relocation
find_boot_repositories > $repofile
+# set up network if needed
+[ "$ALPINE_REPO" ] && configure_ip
+
# silently fix apk arch in case the apkovl does not match
if [ -r "$sysroot"/etc/apk/arch ]; then
apk_arch="$(apk --print-arch)"