git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67305 from adisbladis/iso-image-defaults

Change ISO image defaults

commit1d1ff2cc500a812010023cf1a4a4e89102c0d08c authorworldofpeace <worldofpeace@protonmail.ch> dateSat 28 Sep 2019, 18:09 (7 years ago) parent67393f604bd834
2 files changed+4−12
nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix+2−8 nixos/modules/installer/cd-dvd/iso-image.nix+2−4
nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix+2−8
@@ -22,14 +22,8 @@ with lib;
2222
2323 system.activationScripts.installerDesktop = let
2424
25− manualDesktopFile = pkgs.writeScript "nixos-manual.desktop" ''
26− [Desktop Entry]
27− Version=1.0
28− Type=Application
29− Name=NixOS Manual
30− Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html
31− Icon=text-html
32− '';
25+ # Comes from documentation.nix when xserver and nixos.enable are true.
26+ manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop";
3327
3428 homeDir = "/home/nixos/";
3529 desktopDir = homeDir + "Desktop/";
nixos/modules/installer/cd-dvd/iso-image.nix+2−4
@@ -165,8 +165,8 @@ let
165165 else
166166 "# No refind for ${targetArch}"
167167 ;
168−
169− grubPkgs = if config.boot.loader.grub.forcei686 then pkgs.pkgsi686Linux else pkgs;
168+
169+ grubPkgs = if config.boot.loader.grub.forcei686 then pkgs.pkgsi686Linux else pkgs;
170170
171171 grubMenuCfg = ''
172172 #
@@ -562,8 +562,6 @@ in
562562
563563 boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" ];
564564
565− boot.blacklistedKernelModules = [ "nouveau" ];
566−
567565 boot.initrd.kernelModules = [ "loop" ];
568566
569567 # Closures to be copied to the Nix store on the CD, namely the init