diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-29 14:37:13 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-29 14:37:13 +0100 |
| commit | 62830d956228fb3b420a3811c11def0f4aa087b7 (patch) | |
| tree | eb4884796cc063350b618595390a7bf560d946c3 | |
| parent | cb4de9c32ea298df8dc0c05ea791af8490e823f5 (diff) | |
| download | alpine-conf-62830d956228fb3b420a3811c11def0f4aa087b7.tar.bz2 alpine-conf-62830d956228fb3b420a3811c11def0f4aa087b7.tar.xz | |
setup-disk: fix initfs_features
We want have fewer features in the initfs and only add those that are
needed and detected.
This is a revert of 25c4933f121266203bce9024acb2d00421f88e8d
| -rw-r--r-- | setup-disk.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/setup-disk.in b/setup-disk.in index 7e14c09..423885a 100644 --- a/setup-disk.in +++ b/setup-disk.in @@ -338,10 +338,7 @@ install_mounted_root() { local mnt="$1" shift 1 local disks="${@}" mnt_boot= boot_fs= root_fs= - local initfs_features=$(. /etc/mkinitfs/mkinitfs.conf >/dev/null 2>&1 && echo "$features") - if [ -z "$initfs_features" ]; then - initfs_features="ata base cdrom ext2 ext3 ext4 keymap kms mmc raid scsi usb virtio nvme" - fi + local initfs_features="ata base ide scsi usb virtio" local pvs= dev= rootdev= bootdev= extlinux_raidopt= root= modules= local kernel_opts="quiet" |