commit 6948c3ab80797770bc584e521b5c5a8ca02b495e · pyrox.dev/nixpkgs

+2 -2

nixos/doc/manual/installation/installing-usb.xml

···

       6
       6
        
       

     

       7
       7
        
       <title>Booting from a USB Drive</title>

     

       8
       8
        
       

     

       9
       9
       -
       <para>For systems without CD drive, the NixOS livecd can be booted from

     

       10
       10
       -
       a usb stick. For non-UEFI installations,

     

       9
       9
       +
       <para>For systems without CD drive, the NixOS live CD can be booted from

     

       10
       10
       +
       a USB stick. For non-UEFI installations,

     

       11
       11
        
       <link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>

     

       12
       12
        
       will work. For UEFI installations, you should mount the ISO, copy its contents

     

       13
       13
        
       verbatim to your drive, then either:

+6 -6

nixos/modules/installer/cd-dvd/iso-image.nix

···

       30
       30
        
         #   * COM32 entries (chainload, reboot, poweroff) are not recognized. They

     

       31
       31
        
         #     result in incorrect boot entries.

     

       32
       32
        
       

     

       33
       33
       -
         baseIsolinuxCfg =

     

       34
       34
       -
           ''

     

       33
       33
       +
         baseIsolinuxCfg = ''

     

       35
       34
        
           SERIAL 0 38400

     

       36
       35
        
           TIMEOUT ${builtins.toString syslinuxTimeout}

     

       37
       36
        
           UI vesamenu.c32

     
···

       44
       43
        
           LINUX /boot/bzImage

     

       45
       44
        
           APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}

     

       46
       45
        
           INITRD /boot/initrd

     

       47
       47
       -
           '';

     

       46
       46
       +
         '';

     

       48
       47
        
       

     

       49
       48
        
         isolinuxMemtest86Entry = ''

     

       50
       49
        
           LABEL memtest

     
···

       55
       54
        
       

     

       56
       55
        
         isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry);

     

       57
       56
        
       

     

       58
       58
       -
         # The efi boot image

     

       57
       57
       +
         # The EFI boot image.

     

       59
       58
        
         efiDir = pkgs.runCommand "efi-directory" {} ''

     

       60
       59
        
           mkdir -p $out/EFI/boot

     

       61
       60
        
           cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi

     

       62
       61
        
           mkdir -p $out/loader/entries

     

       63
       63
       -
           echo "title NixOS LiveCD" > $out/loader/entries/nixos-livecd.conf

     

       62
       62
       +
           echo "title NixOS Live CD" > $out/loader/entries/nixos-livecd.conf

     

       64
       63
        
           echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf

     

       65
       64
        
           echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd.conf

     

       66
       65
        
           echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> $out/loader/entries/nixos-livecd.conf

     
···

       232
       231
        
             [ "root=LABEL=${config.isoImage.volumeID}"

     

       233
       232
        
               "boot.shell_on_fail"

     

       234
       233
        
               "nomodeset"

     

       235
       235
       -
               "systemd.log_level=debug"

     

       236
       234
        
             ];

     

       237
       235
        
       

     

       238
       236
        
           fileSystems."/" =

     
···

       271
       269
        
             };

     

       272
       270
        
       

     

       273
       271
        
           boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ];

     

       272
       272
       +
       

     

       273
       273
       +
           boot.blacklistedKernelModules = [ "nouveau" ];

     

       274
       274
        
       

     

       275
       275
        
           boot.initrd.kernelModules = [ "loop" ];

     

       276
       276