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: 0a941b03d055
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 73699a03c95e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 14, 2018

  1. azure-agent: add option to control auto mount 

     of resource disk.

(cherry picked from commit 1d971b7)
    @jbgi @Mic92
    jbgi authored and Mic92 committed May 14, 2018
    Copy the full SHA
    49a6977 View commit details

  2. azure-agent: add bash to service path. 

     as is often required by linux extensions.

(cherry picked from commit 28e352c)
    @jbgi @Mic92
    jbgi authored and Mic92 committed May 14, 2018
    Copy the full SHA
    73699a0 View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 nixos/modules/virtualisation/azure-agent.nix
8 changes: 6 additions & 2 deletions nixos/modules/virtualisation/azure-agent.nix
View file
Original file line number Diff line number Diff line change
@@ -66,6 +66,10 @@ in
default = false;
description = "Whether to enable verbose logging.";
};
mountResourceDisk = mkOption {
default = true;
description = "Whether the agent should format (ext4) and mount the resource disk to /mnt/resource.";
};
};

###### implementation
@@ -112,7 +116,7 @@ in
Provisioning.ExecuteCustomData=n
# Format if unformatted. If 'n', resource disk will not be mounted.
ResourceDisk.Format=y
ResourceDisk.Format=${if cfg.mountResourceDisk then "y" else "n"}
# File system on the resource disk
# Typically ext3 or ext4. FreeBSD images should use 'ufs2' here.
@@ -181,7 +185,7 @@ in
after = [ "network-online.target" "sshd.service" ];
wants = [ "network-online.target" ];

path = [ pkgs.e2fsprogs ];
path = [ pkgs.e2fsprogs pkgs.bash ];
description = "Windows Azure Agent Service";
unitConfig.ConditionPathExists = "/etc/waagent.conf";
serviceConfig = {