Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8f72f9398180
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9c90ff7e7df9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 8, 2017

  1. nixos/iso-image: add option for copytoram

    lassulus committed May 8, 2017
    Copy the full SHA
    334ac4f View commit details

Commits on May 9, 2017

  1. Merge pull request #25611 from Lassulus/copytoram-option 

    nixos/iso-image: add option for copytoram
    @Mic92
    Mic92 authored May 9, 2017
    Copy the full SHA
    9c90ff7 View commit details
Showing with 13 additions and 0 deletions.
  1. +13 −0 nixos/modules/installer/cd-dvd/iso-image.nix
13 changes: 13 additions & 0 deletions nixos/modules/installer/cd-dvd/iso-image.nix
View file
Original file line number Diff line number Diff line change
@@ -50,6 +50,13 @@ let
LINUX /boot/bzImage
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset
INITRD /boot/initrd
# A variant to boot with 'copytoram'
LABEL boot-copytoram
MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (with copytoram)
LINUX /boot/bzImage
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram
INITRD /boot/initrd
'';

isolinuxMemtest86Entry = ''
@@ -78,6 +85,12 @@ let
echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-nomodeset.conf
echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset" >> $out/loader/entries/nixos-livecd-nomodeset.conf
# A variant to boot with 'copytoram'
echo "title NixOS Live CD (with copytoram)" > $out/loader/entries/nixos-livecd-copytoram.conf
echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd-copytoram.conf
echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-copytoram.conf
echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram" >> $out/loader/entries/nixos-livecd-copytoram.conf
echo "default nixos-livecd" > $out/loader/loader.conf
echo "timeout ${builtins.toString config.boot.loader.timeout}" >> $out/loader/loader.conf
'';