diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-25 19:03:52 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-25 19:06:07 +0200 |
| commit | 6948c3ab80797770bc584e521b5c5a8ca02b495e (patch) | |
| tree | e0161452d31874368ee52bc36934994b7af20523 /nixos | |
| parent | c49b24c94004807f3de5eef9535d2d50d184dbd6 (diff) | |
Installer: Add nomodeset and blacklist the nouveau driver
I observed a hang at the moment the nouveau driver gets loaded on a
GTX 970.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/installation/installing-usb.xml | 4 | ||||
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 97e3d2eaa1c0..5def6e8753fe 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -6,8 +6,8 @@ <title>Booting from a USB Drive</title> -<para>For systems without CD drive, the NixOS livecd can be booted from -a usb stick. For non-UEFI installations, +<para>For systems without CD drive, the NixOS live CD can be booted from +a USB stick. For non-UEFI installations, <link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link> will work. For UEFI installations, you should mount the ISO, copy its contents verbatim to your drive, then either: diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 3712d3723d08..1dec7bd0f434 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -30,8 +30,7 @@ let # * COM32 entries (chainload, reboot, poweroff) are not recognized. They # result in incorrect boot entries. - baseIsolinuxCfg = - '' + baseIsolinuxCfg = '' SERIAL 0 38400 TIMEOUT ${builtins.toString syslinuxTimeout} UI vesamenu.c32 @@ -44,7 +43,7 @@ let LINUX /boot/bzImage APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} INITRD /boot/initrd - ''; + ''; isolinuxMemtest86Entry = '' LABEL memtest @@ -55,12 +54,12 @@ let isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); - # The efi boot image + # The EFI boot image. efiDir = pkgs.runCommand "efi-directory" {} '' mkdir -p $out/EFI/boot cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi mkdir -p $out/loader/entries - echo "title NixOS LiveCD" > $out/loader/entries/nixos-livecd.conf + echo "title NixOS Live CD" > $out/loader/entries/nixos-livecd.conf echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd.conf echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> $out/loader/entries/nixos-livecd.conf @@ -232,7 +231,6 @@ in [ "root=LABEL=${config.isoImage.volumeID}" "boot.shell_on_fail" "nomodeset" - "systemd.log_level=debug" ]; fileSystems."/" = @@ -272,6 +270,8 @@ in boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ]; + boot.blacklistedKernelModules = [ "nouveau" ]; + boot.initrd.kernelModules = [ "loop" ]; # Closures to be copied to the Nix store on the CD, namely the init |