summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-02-10 18:51:56 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-02-10 18:51:56 +0000
commita36b344814d3cb49991ac17e9410ed665b8dfde9 (patch)
treefb83c5829a12f5c2af6a049be97a99c5bb45b00f
parent4ff7dd2297b46e067d70b791b7bab363025c17dd (diff)
downloadalpine-conf-a36b344814d3cb49991ac17e9410ed665b8dfde9.tar.bz2
alpine-conf-a36b344814d3cb49991ac17e9410ed665b8dfde9.tar.xz
setup-disk: use repositories both from running system and apkovl
-rw-r--r--setup-disk.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/setup-disk.in b/setup-disk.in
index fc64694..a6b9efa 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -139,10 +139,14 @@ install_mounted_root() {
local apkflags="--quiet --progress --update-cache --clean-protected"
local pkgs=$(cat "$mnt"/var/lib/apk/world)
pkgs="$pkgs acct linux-grsec alpine-base"
+ local repos=$(sed -e 's/\#.*//' /etc/apk/repositories)
+ local repoflags=
+ for i in $repos; do
+ repoflags="$repoflags --repository $i"
+ done
apk add --root "$mnt" $apkflags --overlay-from-stdin \
- --repositories-file /etc/apk/repositories \
- $pkgs <$ovlfiles>/dev/null || return 1
+ $repoflags $pkgs <$ovlfiles>/dev/null || return 1
echo ""
# make things bootable