commit 5276ebb5ee9bdd47e476d507b12141e84d2903d6 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix

···

       26
       26
        
         # A clue for the kernel loading

     

       27
       27
        
         kernelParams = pkgs.writeText "kernel-params.txt" ''

     

       28
       28
        
           Kernel Parameters:

     

       29
       29
       -
             init=/boot/init systemConfig=/boot/init ${toString config.boot.kernelParams}

     

       29
       29
       +
             init=/boot/init ${toString config.boot.kernelParams}

     

       30
       30
        
         '';

     

       31
       31
        
       

     

       32
       32
        
         # System wide nixpkgs config

+2 -2

nixos/modules/installer/cd-dvd/system-tarball-pc.nix

···

       23
       23
        
           label nixos

     

       24
       24
        
             MENU LABEL ^NixOS using nfsroot

     

       25
       25
        
             KERNEL bzImage

     

       26
       26
       -
             append ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init rw

     

       26
       26
       +
             append ip=dhcp nfsroot=/home/pcroot init=${config.system.build.toplevel}/init rw

     

       27
       27
        
       

     

       28
       28
        
           # I don't know how to make this boot with nfsroot (using the initrd)

     

       29
       29
        
           label nixos_initrd

     

       30
       30
        
             MENU LABEL NixOS booting the poor ^initrd.

     

       31
       31
        
             KERNEL bzImage

     

       32
       32
       -
             append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init rw

     

       32
       32
       +
             append initrd=initrd ip=dhcp nfsroot=/home/pcroot init=${config.system.build.toplevel}/init rw

     

       33
       33
        
       

     

       34
       34
        
           label memtest

     

       35
       35
        
             MENU LABEL ^${pkgs.memtest86.name}

+1 -1

nixos/modules/misc/crashdump.nix

···

       53
       53
        
               ${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \

     

       54
       54
        
               --initrd=/run/current-system/initrd \

     

       55
       55
        
               --reset-vga --console-vga \

     

       56
       56
       -
               --command-line="systemConfig=$(readlink -f /run/current-system) init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"

     

       56
       56
       +
               --command-line="init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"

     

       57
       57
        
             '';

     

       58
       58
        
             kernelParams = [

     

       59
       59
        
              "crashkernel=${crashdump.reservedMemory}"

+1 -1

nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh

···

       109
       109
        
                   exit 1

     

       110
       110
        
               fi

     

       111
       111
        
           fi

     

       112
       112
       -
           echo "  APPEND systemConfig=$path init=$path/init $extraParams"

     

       112
       112
       +
           echo "  APPEND init=$path/init $extraParams"

     

       113
       113
        
       }

     

       114
       114
        
       

     

       115
       115
        
       tmpFile="$target/extlinux/extlinux.conf.tmp.$$"

-1

nixos/modules/system/boot/loader/grub/install-grub.pl

···

       459
       459
        
           # FIXME: $confName

     

       460
       460
        
       

     

       461
       461
        
           my $kernelParams =

     

       462
       462
       -
               "systemConfig=" . Cwd::abs_path($path) . " " .

     

       463
       462
        
               "init=" . Cwd::abs_path("$path/init") . " " .

     

       464
       463
        
               readFile("$path/kernel-params");

     

       465
       464
        
           my $xenParams = $xen && -e "$path/xen-params" ? readFile("$path/xen-params") : "";

+1 -1

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

···

       101
       101
        
               entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation)

     

       102
       102
        
           generation_dir = os.readlink(system_dir(profile, generation))

     

       103
       103
        
           tmp_path = "%s.tmp" % (entry_file)

     

       104
       104
       -
           kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir)

     

       104
       104
       +
           kernel_params = "init=%s/init " % generation_dir

     

       105
       105
        
       

     

       106
       106
        
           with open("%s/kernel-params" % (generation_dir)) as params_file:

     

       107
       107
        
               kernel_params = kernel_params + params_file.read()