From 21bf3b5ff57a95bfdd70d00698f9b59810aaa460 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 7 Jan 2014 09:35:42 +0000
Subject: init: silently fix apk arch in case apkovl arch don't match

ref #2529
---
 initramfs-init.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/initramfs-init.in b/initramfs-init.in
index 0c10a19..78e9b80 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -688,6 +688,14 @@ cp -a /etc/apk/keys $sysroot/etc/apk
 # generate apk repositories file. needs to be done after relocation
 find_boot_repositories > /tmp/repositories
 
+# silently fix apk arch in case the apkovl does not match
+if [ -r "$sysroot"/etc/apk/arch ]; then
+	apk_arch="$(apk --print-arch)"
+	if [ -n "$apk_arch" ]; then
+		echo "$apk_arch" > "$sysroot"/etc/apk/arch
+	fi
+fi
+
 # generate repo opts for apk
 for i in $(cat /tmp/repositories); do
 	repo_opt="$repo_opt --repository $i"
-- 
cgit v1.2.3