alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #39072 from jbgi/azure-agent-mount-resource-option

Browse source 
Azure agent mount resource option + bash to path
This commit is contained in:
Jörg Thalheim 2018-04-17 21:12:36 +01:00 committed by GitHub
parent d3cd910ee0 28e352cff8
commit 6bd83e624c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/virtualisation/azure-agent.nix
View file

@ -66,6 +66,10 @@ in
default = false; default = false;
description = "Whether to enable verbose logging."; 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 ###### implementation
@ -112,7 +116,7 @@ in
Provisioning.ExecuteCustomData=n Provisioning.ExecuteCustomData=n
# Format if unformatted. If 'n', resource disk will not be mounted. # 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 # File system on the resource disk
# Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here.
@ -181,7 +185,7 @@ in
after = [ "network-online.target" "sshd.service" ]; after = [ "network-online.target" "sshd.service" ];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
path = [ pkgs.e2fsprogs ]; path = [ pkgs.e2fsprogs pkgs.bash ];
description = "Windows Azure Agent Service"; description = "Windows Azure Agent Service";
unitConfig.ConditionPathExists = "/etc/waagent.conf"; unitConfig.ConditionPathExists = "/etc/waagent.conf";
serviceConfig = { serviceConfig = {