diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-08 23:51:46 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-08 23:51:46 +0100 |
| commit | 0ee88cffca0dbc428501b7920c3b2bfe011a6420 (patch) | |
| tree | 01cb15661ce9c77a89a52a08d6285e731e5d1473 | |
| parent | 4faeca0cbd6104cbc3c39762c11038534a2fe084 (diff) | |
| parent | fda9d83ddfe833c95ca630064bb6d2cbaad2da6b (diff) | |
| download | nixpkgs-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar nixpkgs-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar.gz nixpkgs-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar.bz2 nixpkgs-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar.lz nixpkgs-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar.xz nixpkgs-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar.zst nixpkgs-0ee88cffca0dbc428501b7920c3b2bfe011a6420.zip | |
Merge pull request #10417 from puffnfresh/nixos/mmc_block
initrd: add mmc_block to default available modules
| -rw-r--r-- | nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/installer/cd-dvd/system-tarball.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index de0cc604bf3..7badfcb8df2 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -86,8 +86,7 @@ in system.boot.loader.kernelFile = "uImage"; boot.initrd.availableKernelModules = - [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ums-cypress" "rtc_mv" - "ext4" ]; + [ "mvsdio" "reiserfs" "ext3" "ums-cypress" "rtc_mv" "ext4" ]; boot.postBootCommands = '' diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix index c24fe97fba4..90e9b98a457 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball.nix @@ -43,7 +43,7 @@ in # so that we don't need to know its device. fileSystems = [ ]; - # boot.initrd.availableKernelModules = [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ext4" ]; + # boot.initrd.availableKernelModules = [ "mvsdio" "reiserfs" "ext3" "ext4" ]; # boot.initrd.kernelModules = [ "rtc_mv" ]; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 6bc046d0261..a6bbca9b30b 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -184,6 +184,9 @@ in "ide_disk" "ide_generic" + # SD cards and internal eMMC drives. + "mmc_block" + # Support USB keyboards, in case the boot fails and we only have # a USB keyboard. "uhci_hcd" |