summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2018-08-23 01:42:21 +0000
committervolth <volth@volth.com>2018-08-23 01:42:34 +0000
commitd4ef7c677222c9ec9beead50ffe45825459a4b49 (patch)
treeb669b24b56e0a7973ac51ac93ac1323f47852113
parentecd9d74d973e9942574e77697cfb8db6c76d1764 (diff)
usb-storage -> uas
Following up https://github.com/NixOS/nixpkgs/pull/23665 Bootable USB-drives are not limited to ISO-images, there can be "normal" MBR/GPT-partitioned disk connected via USB-rack. Also, "uas" implies "usb-storage", so there is no need to mention both.
-rw-r--r--nixos/modules/installer/cd-dvd/iso-image.nix2
-rw-r--r--nixos/modules/profiles/all-hardware.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 08923970cd38..1ac9e5c5c74b 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -318,7 +318,7 @@ in
options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ];
};
- boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" "uas" ];
+ boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" ];
boot.blacklistedKernelModules = [ "nouveau" ];
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 0d7124be0a5c..19f821ae17f3 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -33,7 +33,7 @@
# USB support, especially for booting from USB CD-ROM
# drives.
- "usb_storage"
+ "uas"
# Firewire support. Not tested.
"ohci1394" "sbp2"