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: 5966c5698f8c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e3ac65f4c137
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Nov 13, 2018

  1. allow cloud-init to support creating btrfs partitions

    @dingxiangfei2009
    dingxiangfei2009 committed Nov 13, 2018
    Copy the full SHA
    a965921 View commit details

  2. nixos/cloud-init: add enable suffix to ext4/btrfs 

    Makes the optional more self-describing and allows future extensions
    @Mic92
    Mic92 committed Nov 13, 2018
    Copy the full SHA
    a5c7476 View commit details

  3. Merge pull request #50186 from dingxiangfei2009/cloud-init-btrfs 

    Allow cloud-init to support creating btrfs partitions
    @Mic92
    Mic92 authored Nov 13, 2018
    Copy the full SHA
    e3ac65f View commit details
Showing with 26 additions and 3 deletions.
  1. +26 −3 nixos/modules/services/system/cloud-init.nix
29 changes: 26 additions & 3 deletions nixos/modules/services/system/cloud-init.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,20 @@
with lib;

let cfg = config.services.cloud-init;
path = with pkgs; [ cloud-init nettools utillinux e2fsprogs shadow openssh iproute ];
path = with pkgs; [
cloud-init
iproute
nettools
openssh
shadow
utillinux
] ++ optional cfg.btrfs.enable btrfs-progs
++ optional cfg.ext4.enable e2fsprogs
;
in
{
options = {

services.cloud-init = {

enable = mkOption {
type = types.bool;
default = false;
@@ -29,6 +36,22 @@ in
'';
};

btrfs.enable = mkOption {
type = types.bool;
default = false;
description = ''
Allow the cloud-init service to operate `btrfs` filesystem.
'';
};

ext4.enable = mkOption {
type = types.bool;
default = true;
description = ''
Allow the cloud-init service to operate `ext4` filesystem.
'';
};

config = mkOption {
type = types.str;
default = ''