diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-14 16:17:32 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-14 16:17:32 +0000 |
| commit | 2d7ee0af3159a35c3fd1369cf9d9366d8dd2a954 (patch) | |
| tree | 9fb6624c4cba0a303165cb1cc16cc48584fa44ba | |
| parent | 9ed0b9efd74f0532cae9b466311863f1bb66d5d1 (diff) | |
| download | alpine-conf-2d7ee0af3159a35c3fd1369cf9d9366d8dd2a954.zip | |
setup-disk: clean up install of filesystem progs
Do not install e2fsprogs unless it will be used
| -rw-r--r-- | setup-disk.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/setup-disk.in b/setup-disk.in index 09c23db..4182268 100644 --- a/setup-disk.in +++ b/setup-disk.in @@ -436,14 +436,17 @@ stop_all_raid() { # install needed programs init_progs() { - local raidpkg= fs= fstools="e2fsprogs" + local raidpkg= fs= fstools= [ -n "$USE_RAID" ] && raidpkg="mdadm" for fs in $BOOTFS $ROOTFS $VARFS; do - case $fs in - xfs) fstools="$fstools xfsprogs"; modprobe xfs;; # we need load btrfs module early to avoid the error message: # 'failed to open /dev/btrfs-control' - btrfs) fstools="$fstools btrfs-progs"; modprobe btrfs;; + modprobe $fs + + case $fs in + xfs) fstools="$fstools xfsprogs";; + ext*) fstools="$fstools e2fsprogs";; + btrfs) fstools="$fstools btrfs-progs";; esac done apk add --quiet sfdisk lvm2 $raidpkg syslinux $fstools $@ |