aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-12-14 16:19:21 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-12-14 16:19:38 +0000
commit90f78c09ce8eff90ce1ebb85a5f2f56499a49416 (patch)
tree8cdfd16a9d84dc64cd4a82dcd83a63a6e4bdaaf0
parent2d7ee0af3159a35c3fd1369cf9d9366d8dd2a954 (diff)
downloadalpine-conf-90f78c09ce8eff90ce1ebb85a5f2f56499a49416.tar.bz2
alpine-conf-90f78c09ce8eff90ce1ebb85a5f2f56499a49416.tar.xz
setup-disk: only install lvm2 if it will be used
-rw-r--r--setup-disk.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/setup-disk.in b/setup-disk.in
index 4182268..489cce5 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -436,8 +436,9 @@ stop_all_raid() {
# install needed programs
init_progs() {
- local raidpkg= fs= fstools=
+ local raidpkg= lvmpkg= fs= fstools=
[ -n "$USE_RAID" ] && raidpkg="mdadm"
+ [ -n "$USE_LVM" ] && lvmpkg="lvm2"
for fs in $BOOTFS $ROOTFS $VARFS; do
# we need load btrfs module early to avoid the error message:
# 'failed to open /dev/btrfs-control'
@@ -449,7 +450,7 @@ init_progs() {
btrfs) fstools="$fstools btrfs-progs";;
esac
done
- apk add --quiet sfdisk lvm2 $raidpkg syslinux $fstools $@
+ apk add --quiet sfdisk $lvmpkg $raidpkg syslinux $fstools $@
}
show_disk_info() {