summaryrefslogtreecommitdiffstats
path: root/initramfs-init.in
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-05-17 14:33:18 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-05-17 14:33:18 +0000
commit4c8535b759fb9f2b34d05f971bee3a4ecc86b734 (patch)
treea5c2f2e25b9c2c41713e65318b96af0c7ead3ccc /initramfs-init.in
parent5da682acedf4011a647394843e819c50e8f5200b (diff)
downloadmkinitfs-4c8535b759fb9f2b34d05f971bee3a4ecc86b734.tar.bz2
mkinitfs-4c8535b759fb9f2b34d05f971bee3a4ecc86b734.tar.xz
Revert "init: only use /etc/apk/world when it exists"
We can not only use /etc/apk/world since it will always be there due to previous apk add --initdb. Instead, clean up the /var/lib/apk/world after upgrade This reverts commit 8981ccbf5b2636c7d2e06b08ffdf87be80fe19c8. Conflicts: initramfs-init.in
Diffstat (limited to 'initramfs-init.in')
-rwxr-xr-xinitramfs-init.in12
1 files changed, 5 insertions, 7 deletions
diff --git a/initramfs-init.in b/initramfs-init.in
index b14ebf9..6e1ebc1 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -481,13 +481,11 @@ if [ -f "$ovl" ]; then
# hack, incase /root/.ssh was included in apkovl
[ -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
- for world in etc/apk/world var/lib/apk/world; do
- if [ -e "$sysroot/$world" ]; then
- pkgs="$pkgs $(cat $sysroot/$world)"
- break;
- fi
- done
+ pkgs="$pkgs $(cat $sysroot/var/lib/apk/world \
+ $sysroot/etc/apk/world 2>/dev/null)"
+ # clean up after upgrade
+ rm -f $sysroot/etc/lbu/packages.list \
+ $sysroot/var/lib/apk/world
# fix up inittab from pre openrc times (alpine v1.8)
if [ -f "$sysroot"/etc/inittab ]; then