summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-04-07 19:44:20 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-04-07 19:49:49 +0000
commitf26201d984495688a5883279a31f9cc935e25a42 (patch)
tree9b7ff5f777a245b150c27c8a7a56981c60dad0c9
parentbfc9332be2fa1f0c863e7fb61c72b62fd7050d91 (diff)
downloadalpine-conf-f26201d984495688a5883279a31f9cc935e25a42.tar.bz2
alpine-conf-f26201d984495688a5883279a31f9cc935e25a42.tar.xz
setup-disk: use new apk-tools locations
-rw-r--r--setup-disk.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup-disk.in b/setup-disk.in
index fd7c0e2..1b5f0ed 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -213,7 +213,7 @@ install_mounted_root() {
EOF
# remove the installed db in case its there so we force re-install
- rm -f "$mnt"/var/lib/apk/installed
+ rm -f "$mnt"/var/lib/apk/installed "$mnt"/lib/apk/db/installed
echon "Installing system on $rootdev: "
# apk reads config from target root so we need to copy the config
mkdir -p "$mnt"/etc/apk/keys/
@@ -221,7 +221,7 @@ EOF
local apkflags="--quiet --progress --update-cache --clean-protected"
- local pkgs=$(cat "$mnt"/var/lib/apk/world)
+ local pkgs=$(cat "$mnt"/etc/apk/world "$mnt"/var/lib/apk/world 2>/dev/null)
pkgs="$pkgs acct linux-$KERNEL_FLAVOR alpine-base"
local repos=$(sed -e 's/\#.*//' /etc/apk/repositories)
local repoflags=