aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-12-17 08:04:47 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-12-17 08:53:47 +0000
commit4f314bd697ebadd47c156f7966f720ef5cddf0ff (patch)
tree998ccb0a20e047dedd65d952631d5d3ca980e89b
parent5cbac6ffb832633ad3ea8349b6e68b26403edd4a (diff)
downloadalpine-conf-3.3.0.tar.bz2
alpine-conf-3.3.0.tar.xz
setup-disk: don't install sfdisk on target systemv3.3.0
-rw-r--r--setup-disk.in4
1 files changed, 3 insertions, 1 deletions
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"