From a36b344814d3cb49991ac17e9410ed665b8dfde9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 10 Feb 2010 18:51:56 +0000 Subject: setup-disk: use repositories both from running system and apkovl --- setup-disk.in | 8 ++++++-- 1 file 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 -- cgit v1.2.3