commit eddf30cc93e1b778b6bc10d0eb1bb175385d034f · pyrox.dev/nixpkgs

+1

nixos/modules/module-list.nix

···

       680
       680
        
         ./system/activation/top-level.nix

     

       681
       681
        
         ./system/boot/coredump.nix

     

       682
       682
        
         ./system/boot/emergency-mode.nix

     

       683
       683
       +
         ./system/boot/grow-partition.nix

     

       683
       684
        
         ./system/boot/initrd-network.nix

     

       684
       685
        
         ./system/boot/initrd-ssh.nix

     

       685
       686
        
         ./system/boot/kernel.nix

+3

nixos/modules/rename.nix

···

       186
       186
        
           (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ])

     

       187
       187
        
           (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])

     

       188
       188
        
       

     

       189
       189
       +
           # Profile splitting

     

       190
       190
       +
           (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])

     

       191
       191
       +
       

     

       189
       192
        
           # Options that are obsolete and have no replacement.

     

       190
       193
        
           (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")

     

       191
       194
        
           (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

+43

nixos/modules/system/boot/grow-partition.nix

···

       1
       1
       +
       # This module automatically grows the root partition.

     

       2
       2
       +
       # This allows an instance to be created with a bigger root filesystem

     

       3
       3
       +
       # than provided by the machine image.

     

       4
       4
       +
       

     

       5
       5
       +
       { config, lib, pkgs, ... }:

     

       6
       6
       +
       

     

       7
       7
       +
       with lib;

     

       8
       8
       +
       

     

       9
       9
       +
       {

     

       10
       10
       +
       

     

       11
       11
       +
         options = {

     

       12
       12
       +
           boot.growPartition = mkEnableOption "grow the root partition on boot";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         config = mkIf config.boot.growPartition {

     

       16
       16
       +
       

     

       17
       17
       +
           boot.initrd.extraUtilsCommands = ''

     

       18
       18
       +
             copy_bin_and_libs ${pkgs.gawk}/bin/gawk

     

       19
       19
       +
             copy_bin_and_libs ${pkgs.gnused}/bin/sed

     

       20
       20
       +
             copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk

     

       21
       21
       +
             copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk

     

       22
       22
       +
       

     

       23
       23
       +
             substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \

     

       24
       24
       +
               --replace "${pkgs.bash}/bin/sh" "/bin/sh" \

     

       25
       25
       +
               --replace "awk" "gawk" \

     

       26
       26
       +
               --replace "sed" "gnused"

     

       27
       27
       +
       

     

       28
       28
       +
             ln -s sed $out/bin/gnused

     

       29
       29
       +
           '';

     

       30
       30
       +
       

     

       31
       31
       +
           boot.initrd.postDeviceCommands = ''

     

       32
       32
       +
             rootDevice="${config.fileSystems."/".device}"

     

       33
       33
       +
             if [ -e "$rootDevice" ]; then

     

       34
       34
       +
               rootDevice="$(readlink -f "$rootDevice")"

     

       35
       35
       +
               parentDevice="$(lsblk -npo PKNAME "$rootDevice")"

     

       36
       36
       +
               TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}"

     

       37
       37
       +
               udevadm settle

     

       38
       38
       +
             fi

     

       39
       39
       +
           '';

     

       40
       40
       +
       

     

       41
       41
       +
         };

     

       42
       42
       +
       

     

       43
       43
       +
       }

+2 -2

nixos/modules/virtualisation/amazon-image.nix

···

       11
       11
        
       let cfg = config.ec2; in

     

       12
       12
        
       

     

       13
       13
        
       {

     

       14
       14
       -
         imports = [ ../profiles/headless.nix ./ec2-data.nix ./grow-partition.nix ./amazon-init.nix ];

     

       14
       14
       +
         imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-init.nix ];

     

       15
       15
        
       

     

       16
       16
        
         config = {

     

       17
       17
        
       

     
···

       21
       21
        
             }

     

       22
       22
        
           ];

     

       23
       23
        
       

     

       24
       24
       -
           virtualisation.growPartition = cfg.hvm;

     

       24
       24
       +
           boot.growPartition = cfg.hvm;

     

       25
       25
        
       

     

       26
       26
        
           fileSystems."/" = {

     

       27
       27
        
             device = "/dev/disk/by-label/nixos";

+2 -1

nixos/modules/virtualisation/google-compute-image.nix

···

       6
       6
        
         gce = pkgs.google-compute-engine;

     

       7
       7
        
       in

     

       8
       8
        
       {

     

       9
       9
       -
         imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ];

     

       9
       9
       +
         imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];

     

       10
       10
        
       

     

       11
       11
        
         system.build.googleComputeImage = import ../../lib/make-disk-image.nix {

     

       12
       12
        
           name = "google-compute-image";

     
···

       29
       29
        
           autoResize = true;

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
       +
         boot.growPartition = true;

     

       32
       33
        
         boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];

     

       33
       34
        
         boot.initrd.kernelModules = [ "virtio_scsi" ];

     

       34
       35
        
         boot.kernelModules = [ "virtio_pci" "virtio_net" ];

+3 -48

nixos/modules/virtualisation/grow-partition.nix

···

       1
       1
       -
       # This module automatically grows the root partition on virtual machines.

     

       2
       2
       -
       # This allows an instance to be created with a bigger root filesystem

     

       3
       3
       -
       # than provided by the machine image.

     

       4
       4
       -
       

     

       5
       5
       -
       { config, lib, pkgs, ... }:

     

       6
       6
       -
       

     

       7
       7
       -
       with lib;

     

       8
       8
       -
       

     

       9
       9
       -
       {

     

       10
       10
       -
       

     

       11
       11
       -
         options = {

     

       12
       12
       -
       

     

       13
       13
       -
           virtualisation.growPartition = mkOption {

     

       14
       14
       -
             type = types.bool;

     

       15
       15
       -
             default = true;

     

       16
       16
       -
           };

     

       17
       17
       -
       

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         config = mkIf config.virtualisation.growPartition {

     

       21
       21
       -
       

     

       22
       22
       -
           boot.initrd.extraUtilsCommands = ''

     

       23
       23
       -
             copy_bin_and_libs ${pkgs.gawk}/bin/gawk

     

       24
       24
       -
             copy_bin_and_libs ${pkgs.gnused}/bin/sed

     

       25
       25
       -
             copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk

     

       26
       26
       -
             copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk

     

       27
       27
       -
       

     

       28
       28
       -
             substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \

     

       29
       29
       -
               --replace "${pkgs.bash}/bin/sh" "/bin/sh" \

     

       30
       30
       -
               --replace "awk" "gawk" \

     

       31
       31
       -
               --replace "sed" "gnused"

     

       32
       32
       -
       

     

       33
       33
       -
             ln -s sed $out/bin/gnused

     

       34
       34
       -
           '';

     

       35
       35
       -
       

     

       36
       36
       -
           boot.initrd.postDeviceCommands = ''

     

       37
       37
       -
             rootDevice="${config.fileSystems."/".device}"

     

       38
       38
       -
             if [ -e "$rootDevice" ]; then

     

       39
       39
       -
               rootDevice="$(readlink -f "$rootDevice")"

     

       40
       40
       -
               parentDevice="$(lsblk -npo PKNAME "$rootDevice")"

     

       41
       41
       -
               TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}"

     

       42
       42
       -
               udevadm settle

     

       43
       43
       -
             fi

     

       44
       44
       -
           '';

     

       45
       45
       -
       

     

       46
       46
       -
         };

     

       47
       47
       -
       

     

       48
       48
       -
       }

     

       1
       1
       +
       # This profile is deprecated, use boot.growPartition directly.

     

       2
       2
       +
       builtins.trace "the profile <nixos/modules/virtualisation/grow-partition.nix> is deprecated, use boot.growPartition instead"

     

       3
       3
       +
       { }

+1 -3

nixos/modules/virtualisation/nova-config.nix

···

       6
       6
        
         imports = [

     

       7
       7
        
           ../profiles/qemu-guest.nix

     

       8
       8
        
           ../profiles/headless.nix

     

       9
       9
       -
           ./grow-partition.nix

     

       10
       9
        
         ];

     

       11
       10
        
       

     

       12
       11
        
         config = {

     
···

       15
       14
        
             autoResize = true;

     

       16
       15
        
           };

     

       17
       16
        
       

     

       18
       18
       -
           virtualisation.growPartition = true;

     

       19
       19
       -
       

     

       17
       17
       +
           boot.growPartition = true;

     

       20
       18
        
           boot.kernelParams = [ "console=ttyS0" ];

     

       21
       19
        
           boot.loader.grub.device = "/dev/vda";

     

       22
       20
        
           boot.loader.timeout = 0;

+1 -3

nixos/modules/virtualisation/virtualbox-image.nix

···

       8
       8
        
       

     

       9
       9
        
       in {

     

       10
       10
        
       

     

       11
       11
       -
         imports = [ ./grow-partition.nix ];

     

       12
       12
       -
       

     

       13
       11
        
         options = {

     

       14
       12
        
           virtualbox = {

     

       15
       13
        
             baseImageSize = mkOption {

     
···

       23
       21
        
         };

     

       24
       22
        
       

     

       25
       23
        
         config = {

     

       26
       26
       -
       

     

       27
       24
        
           system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix {

     

       28
       25
        
             name = "nixos-ova-${config.system.nixosLabel}-${pkgs.stdenv.system}";

     

       29
       26
        
       

     
···

       71
       68
        
             autoResize = true;

     

       72
       69
        
           };

     

       73
       70
        
       

     

       71
       71
       +
           boot.growPartition = true;

     

       74
       72
        
           boot.loader.grub.device = "/dev/sda";

     

       75
       73
        
       

     

       76
       74
        
           virtualisation.virtualbox.guest.enable = true;

+1 -1

pkgs/tools/misc/cloud-utils/default.nix

···

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         # NOTICE: if you bump this, make sure to run

     

       8
       8
        
         # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops

     

       9
       9
       -
         # growpart is needed in initrd in nixos/modules/virtualisation/grow-partition.nix

     

       9
       9
       +
         # growpart is needed in initrd in nixos/system/boot/grow-partition.nix

     

       10
       10
        
         name = "cloud-utils-${version}";

     

       11
       11
        
         version = "0.30";

     

       12
       12
        
         src = fetchurl {