aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-04-30 08:01:55 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-04-30 09:13:54 +0000
commit8981ccbf5b2636c7d2e06b08ffdf87be80fe19c8 (patch)
tree1f1bc0b3e0f22cfb5408dd2a70b9eb0bf2062371
parente3c208fb91f7242046900626da1400e6c6499f30 (diff)
downloadmkinitfs-8981ccbf5b2636c7d2e06b08ffdf87be80fe19c8.tar.bz2
mkinitfs-8981ccbf5b2636c7d2e06b08ffdf87be80fe19c8.tar.xz
init: only use /etc/apk/world when it exists
We should not read /var/lib/apk/world if /etc/apk/world exists.
-rwxr-xr-xinitramfs-init.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/initramfs-init.in b/initramfs-init.in
index 94cdc1b..bec3b52 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -484,7 +484,12 @@ if [ -f "$ovl" ]; then
[ -d "$sysroot/root" ] && chmod 700 "$sysroot/root"
pkgs="$pkgs $(sed 's/\#.*//' $sysroot/etc/lbu/packages.list 2>/dev/null)"
rm -f "$sysroot"/etc/lbu/packages.list
- pkgs="$pkgs $(cat $sysroot/var/lib/apk/world $sysroot/etc/apk/world 2>/dev/null)"
+ for world in etc/apk/world var/lib/apk/world; do
+ if [ -e "$sysroot/$world" ]; then
+ pkgs="$pkgs $(cat $sysroot/$world)"
+ break;
+ fi
+ done
else
# add some boot services by default
rc_add devfs sysinit