From 4f314bd697ebadd47c156f7966f720ef5cddf0ff Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Dec 2015 08:04:47 +0000 Subject: setup-disk: don't install sfdisk on target system --- setup-disk.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup-disk.in b/setup-disk.in index 750ab46..ea3c590 100644 --- a/setup-disk.in +++ b/setup-disk.in @@ -326,7 +326,9 @@ EOF cp /etc/apk/keys/* "$mnt"/etc/apk/keys/ local apkflags="--initdb --quiet --progress --update-cache --clean-protected" - local pkgs=$(cat "$mnt"/etc/apk/world "$mnt"/var/lib/apk/world 2>/dev/null) + local pkgs=$(grep -h -v -w sfdisk "$mnt"/etc/apk/world \ + "$mnt"/var/lib/apk/world 2>/dev/null) + pkgs="$pkgs acct linux-$KERNEL_FLAVOR alpine-base" if [ "$(rc --sys)" = "XEN0" ]; then pkgs="$pkgs xen-hypervisor" -- cgit v1.2.3