diff options
author | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
commit | 9adad8612b082bcbae30c81678a04b79a44079a4 (patch) | |
tree | 6814d056ee2960d122842dc9c830bb411c40d5ff /nixos/modules/system/boot/stage-2-init.sh | |
parent | 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1 (diff) | |
download | nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.gz nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.bz2 nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.lz nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.xz nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.zst nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.zip |
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing changes made to 760b2b9048ea775c319cb348d74447a20dea513e.
Diffstat (limited to 'nixos/modules/system/boot/stage-2-init.sh')
-rw-r--r-- | nixos/modules/system/boot/stage-2-init.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index c5a14f0766d..4a7f073ea8a 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -207,5 +207,6 @@ exec {logOutFd}>&- {logErrFd}>&- # Start systemd. echo "starting systemd..." PATH=/run/current-system/systemd/lib/systemd \ + MODULE_DIR=/run/booted-system/kernel-modules/lib/modules \ LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \ exec systemd |