commit 9e42d02047fe1153555f8c81039cb48135311e6d · pyrox.dev/nixpkgs

+1

lib/modules.nix

···

       710
       710
        
       

     

       711
       711
        
         mkOptionDefault = mkOverride 1500; # priority of option defaults

     

       712
       712
        
         mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default

     

       713
       713
       +
         mkImageMediaOverride = mkOverride 60; # image media profiles can be derived by inclusion into host config, hence needing to override host config, but do allow user to mkForce

     

       713
       714
        
         mkForce = mkOverride 50;

     

       714
       715
        
         mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’

     

       715
       716

+4 -5

nixos/modules/installer/cd-dvd/installation-cd-base.nix

···

       30
       30
        
         # Add Memtest86+ to the CD.

     

       31
       31
        
         boot.loader.grub.memtest86.enable = true;

     

       32
       32
        
       

     

       33
       33
       -
         # On a fresh machine, before formatting, an installation

     

       34
       34
       -
         # media cannot assume an existing file system layout such

     

       35
       35
       -
         # as might be defined by the encapsulated host config.

     

       36
       36
       -
         swapDevices = mkOverride 60 [ ];

     

       37
       37
       -
         fileSystems = mkOverride 60 config.lib.isoFileSystems;

     

       33
       33
       +
         # An installation media cannot tolerate a host config defined file

     

       34
       34
       +
         # system layout on a fresh machine, before it has been formatted.

     

       35
       35
       +
         swapDevices = mkImageMediaOverride [ ];

     

       36
       36
       +
         fileSystems = mkImageMediaOverride config.lib.isoFileSystems;

     

       38
       37
        
       

     

       39
       38
        
         boot.postBootCommands = ''

     

       40
       39
        
           for o in $(</proc/cmdline); do

+8 -11

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

···

       614
       614
        
           };

     

       615
       615
        
       

     

       616
       616
        
         };

     

       617
       617
       -
         # store them in lib so we can set the same fileSystems with a

     

       618
       618
       -
         # higher prio on installation media

     

       619
       619
       -
         # This module is often over-layed onto an existing host config

     

       620
       620
       -
         # that defines `fileSystems`. We use mkOverride 60 to override

     

       621
       621
       -
         # standard values, but at the same time leave room for mkForce

     

       622
       622
       -
         # values targeted at the image build.

     

       617
       617
       +
       

     

       618
       618
       +
         # store them in lib so we can mkImageMediaOverride the

     

       619
       619
       +
         # entire file system layout in installation media (only)

     

       623
       620
        
         config.lib.isoFileSystems = {

     

       624
       624
       -
           "/" = mkOverride 60

     

       621
       621
       +
           "/" = mkImageMediaOverride

     

       625
       622
        
             {

     

       626
       623
        
               fsType = "tmpfs";

     

       627
       624
        
               options = [ "mode=0755" ];

     
···

       630
       627
        
           # Note that /dev/root is a symlink to the actual root device

     

       631
       628
        
           # specified on the kernel command line, created in the stage 1

     

       632
       629
        
           # init script.

     

       633
       633
       -
           "/iso" = mkOverride 60

     

       630
       630
       +
           "/iso" = mkImageMediaOverride

     

       634
       631
        
             { device = "/dev/root";

     

       635
       632
        
               neededForBoot = true;

     

       636
       633
        
               noCheck = true;

     
···

       638
       635
        
       

     

       639
       636
        
           # In stage 1, mount a tmpfs on top of /nix/store (the squashfs

     

       640
       637
        
           # image) to make this a live CD.

     

       641
       641
       -
           "/nix/.ro-store" = mkOverride 60

     

       638
       638
       +
           "/nix/.ro-store" = mkImageMediaOverride

     

       642
       639
        
             { fsType = "squashfs";

     

       643
       640
        
               device = "/iso/nix-store.squashfs";

     

       644
       641
        
               options = [ "loop" ];

     

       645
       642
        
               neededForBoot = true;

     

       646
       643
        
             };

     

       647
       644
        
       

     

       648
       648
       -
           "/nix/.rw-store" = mkOverride 60

     

       645
       645
       +
           "/nix/.rw-store" = mkImageMediaOverride

     

       649
       646
        
             { fsType = "tmpfs";

     

       650
       647
        
               options = [ "mode=0755" ];

     

       651
       648
        
               neededForBoot = true;

     

       652
       649
        
             };

     

       653
       650
        
       

     

       654
       654
       -
           "/nix/store" = mkOverride 60

     

       651
       651
       +
           "/nix/store" = mkImageMediaOverride

     

       655
       652
        
             { fsType = "overlay";

     

       656
       653
        
               device = "overlay";

     

       657
       654
        
               options = [

+4 -8

nixos/modules/installer/netboot/netboot.nix

···

       29
       29
        
                 then []

     

       30
       30
        
                 else [ pkgs.grub2 pkgs.syslinux ]);

     

       31
       31
        
       

     

       32
       32
       -
           # This module is often over-layed onto an existing host config

     

       33
       33
       -
           # that defines `fileSystems`. We use mkOverride 60 to override

     

       34
       34
       -
           # standard values, but at the same time leave room for mkForce

     

       35
       35
       -
           # values targeted at the image build.

     

       36
       36
       -
           fileSystems."/" = mkOverride 60

     

       32
       32
       +
           fileSystems."/" = mkImageMediaOverride

     

       37
       33
        
             { fsType = "tmpfs";

     

       38
       34
        
               options = [ "mode=0755" ];

     

       39
       35
        
             };

     

       40
       36
        
       

     

       41
       37
        
           # In stage 1, mount a tmpfs on top of /nix/store (the squashfs

     

       42
       38
        
           # image) to make this a live CD.

     

       43
       43
       -
           fileSystems."/nix/.ro-store" = mkOverride 60

     

       39
       39
       +
           fileSystems."/nix/.ro-store" = mkImageMediaOverride

     

       44
       40
        
             { fsType = "squashfs";

     

       45
       41
        
               device = "../nix-store.squashfs";

     

       46
       42
        
               options = [ "loop" ];

     

       47
       43
        
               neededForBoot = true;

     

       48
       44
        
             };

     

       49
       45
        
       

     

       50
       50
       -
           fileSystems."/nix/.rw-store" = mkOverride 60

     

       46
       46
       +
           fileSystems."/nix/.rw-store" = mkImageMediaOverride

     

       51
       47
        
             { fsType = "tmpfs";

     

       52
       48
        
               options = [ "mode=0755" ];

     

       53
       49
        
               neededForBoot = true;

     

       54
       50
        
             };

     

       55
       51
        
       

     

       56
       56
       -
           fileSystems."/nix/store" = mkOverride 60

     

       52
       52
       +
           fileSystems."/nix/store" = mkImageMediaOverride

     

       57
       53
        
             { fsType = "overlay";

     

       58
       54
        
               device = "overlay";

     

       59
       55
        
               options = [