public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: Use the kernel modules from /run/booted-system

Browse Source 
This prevents failures in systemd-modules-load.service like "Failed to
lookup alias 'ipv6': Function not implemented".
This commit is contained in:
Eelco Dolstra 2012-08-14 17:09:44 -04:00
parent 4475294f57
commit 7a7d04af8a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/system/boot/modprobe.nix
View File

@ -17,8 +17,8 @@ with pkgs.lib;
text = text =
'' ''
#! ${pkgs.stdenv.shell} #! ${pkgs.stdenv.shell}
export MODULE_DIR=/var/run/current-system/kernel-modules/lib/modules export MODULE_DIR=/run/current-system/kernel-modules/lib/modules
# Fall back to the kernel modules used at boot time if the # Fall back to the kernel modules used at boot time if the
# modules in the current configuration don't match the # modules in the current configuration don't match the
# running kernel. # running kernel.
@ -105,8 +105,8 @@ with pkgs.lib;
environment.shellInit = environment.shellInit =
'' ''
export MODULE_DIR=/var/run/current-system/kernel-modules/lib/modules export MODULE_DIR=/run/current-system/kernel-modules/lib/modules
''; '';
}; };

2
modules/system/boot/stage-2-init.sh
View File

@ -178,5 +178,5 @@ fi
# Start systemd. # Start systemd.
echo "starting systemd..." echo "starting systemd..."
PATH=/run/current-system/systemd/lib/systemd \ PATH=/run/current-system/systemd/lib/systemd \
MODULE_DIR=/run/current-system/kernel-modules/lib/modules \ MODULE_DIR=/run/booted-system/kernel-modules/lib/modules \
exec systemd --log-target=journal # --log-level=debug --log-target=console --crash-shell exec systemd --log-target=journal # --log-level=debug --log-target=console --crash-shell