diff options
Diffstat (limited to 'initramfs-init.in')
| -rwxr-xr-x | initramfs-init.in | 12 |
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 |