diff options
author | Mathnerd314 <mathnerd314.gph+hs@gmail.com> | 2015-09-05 17:11:03 -0600 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-13 10:55:44 +0200 |
commit | 87012187b28b1316e7fb0ff584cfe97b79d794a6 (patch) | |
tree | 0921a70365917122b8558dee1555b124588640a8 /nixos/modules/system/boot | |
parent | 667f26cabf8a217b0259b969f43af4b2a4f7c8b2 (diff) | |
download | nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar.gz nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar.bz2 nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar.lz nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar.xz nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar.zst nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.zip |
kmod-debian-aliases: init at 21-1
Diffstat (limited to 'nixos/modules/system/boot')
-rw-r--r-- | nixos/modules/system/boot/modprobe.nix | 6 | ||||
-rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index c49380899664..9bb10eac9880 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -85,11 +85,7 @@ with lib; '')} ${config.boot.extraModprobeConfig} ''; - environment.etc."modprobe.d/usb-load-ehci-first.conf".text = - '' - softdep uhci_hcd pre: ehci_hcd - softdep ohci_hcd pre: ehci_hcd - ''; + environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ]; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 893861a2eed2..f782eca3f647 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -241,6 +241,9 @@ let }; symlink = "/etc/modprobe.d/ubuntu.conf"; } + { object = pkgs.kmod-debian-aliases; + symlink = "/etc/modprobe.d/debian.conf"; + } ]; }; |