summary refs log tree commit diff
path: root/nixos/modules/installer
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-02-08 23:51:46 +0100
committerRobin Gloster <mail@glob.in>2016-02-08 23:51:46 +0100
commit0ee88cffca0dbc428501b7920c3b2bfe011a6420 (patch)
tree01cb15661ce9c77a89a52a08d6285e731e5d1473 /nixos/modules/installer
parent4faeca0cbd6104cbc3c39762c11038534a2fe084 (diff)
parentfda9d83ddfe833c95ca630064bb6d2cbaad2da6b (diff)
downloadnixlib-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar
nixlib-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar.gz
nixlib-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar.bz2
nixlib-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar.lz
nixlib-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar.xz
nixlib-0ee88cffca0dbc428501b7920c3b2bfe011a6420.tar.zst
nixlib-0ee88cffca0dbc428501b7920c3b2bfe011a6420.zip
Merge pull request #10417 from puffnfresh/nixos/mmc_block
initrd: add mmc_block to default available modules
Diffstat (limited to 'nixos/modules/installer')
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix3
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball.nix2
2 files changed, 2 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 de0cc604bf3b..7badfcb8df22 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 c24fe97fba46..90e9b98a4575 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" ];