Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/
Date: Wed, 15 Nov 2017 03:08:34
Message-Id: 1510715160.88fb7f3aacdf3be6c1461ea37d42119a08fbe50c.robbat2@gentoo
1 commit: 88fb7f3aacdf3be6c1461ea37d42119a08fbe50c
2 Author: Daniel Robbins <drobbins <AT> funtoo <DOT> org>
3 AuthorDate: Sun Nov 12 02:39:18 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 15 03:06:00 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=88fb7f3a
7
8 Add f2fs support.
9
10 defaults/linuxrc | 5 +++++
11 defaults/modules_load | 2 +-
12 2 files changed, 6 insertions(+), 1 deletion(-)
13
14 diff --git a/defaults/linuxrc b/defaults/linuxrc
15 index b227ed2..7fd32f0 100644
16 --- a/defaults/linuxrc
17 +++ b/defaults/linuxrc
18 @@ -338,6 +338,11 @@ then
19 [ "$USE_ZFS" = "1" ] && MY_HWOPTS="${MY_HWOPTS} zfs"
20 fi
21
22 +# Hack for f2fs, which uses crc32 but does not depend on it (in many kernels at least):
23 +if [ "${ROOTFSTYPE}" = "f2fs" ]; then
24 + FIRSTMODS="${FIRSTMODS} crc32_generic"
25 +fi
26 +
27 splash 'init'
28
29 cmdline_hwopts
30
31 diff --git a/defaults/modules_load b/defaults/modules_load
32 index 4ad3304..67ef3b9 100644
33 --- a/defaults/modules_load
34 +++ b/defaults/modules_load
35 @@ -29,7 +29,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
36 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
37
38 # Crypto
39 -MODULES_CRYPTO="sha256_generic cbc aes_generic xts"
40 +MODULES_CRYPTO="sha256_generic cbc crc32_generic aes_generic xts"
41
42 # Virtio
43 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto virtio_net"