blob: 293ab3ea93dad0fc00342805d5751ae4d37852ae (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From 5da682acedf4011a647394843e819c50e8f5200b Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 2 May 2012 11:44:04 +0000
Subject: [PATCH] init: search boot repositories after relocation
---
initramfs-init.in | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/initramfs-init.in b/initramfs-init.in
index 4425990..b14ebf9 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -84,6 +84,7 @@ unpack_apkovl() {
fi
# we need openssl. let apk handle deps
+ find_boot_repositories > /tmp/repositories
apk add --quiet --initdb --repositories-file /tmp/repositories openssl\
|| return 1
@@ -434,9 +435,6 @@ fi
retry_mount -o ro $mount_opts $ALPINE_DEV $ALPINE_MNT >/dev/null 2>&1
eend $?
-# generate apk repositories file
-find_boot_repositories > /tmp/repositories
-
# early console?
if [ "$SINGLEMODE" = "yes" ]; then
echo "Entering single mode. Type 'exit' to continue booting."
@@ -543,6 +541,9 @@ pkgs="$pkgs alpine-base"
mkdir -p $sysroot/etc/apk/keys/
cp -a /etc/apk/keys $sysroot/etc/apk
+# generate apk repositories file. needs to be done after relocation
+find_boot_repositories > /tmp/repositories
+
# generate repo opts for apk
for i in $(cat /tmp/repositories); do
repo_opt="$repo_opt --repository $i"
--
1.7.10
|
