diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2015-07-02 15:14:26 -0600 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2015-07-03 16:03:20 +0000 |
| commit | e1187be5b25316b2a1a9250b2aa4450179fe1f7d (patch) | |
| tree | 88d6c1409913e3a630a8e82c5aed5edd26ab16ef /config | |
| parent | 5af8d1f80caf5d49988dbb0cf95ad7c58250b90f (diff) | |
| download | vyos-walinuxagent-e1187be5b25316b2a1a9250b2aa4450179fe1f7d.tar.gz vyos-walinuxagent-e1187be5b25316b2a1a9250b2aa4450179fe1f7d.zip | |
Import patches-unapplied version 2.0.13-0ubuntu1 to ubuntu/wily-proposed
Imported using git-ubuntu import.
Changelog parent: 5af8d1f80caf5d49988dbb0cf95ad7c58250b90f
New changelog entries:
* New upstream release (LP: #1449369).
* Rebased patches for 2.0.12 onto 2.0.13.
Diffstat (limited to 'config')
| -rw-r--r-- | config/99-azure-product-uuid.rules | 9 | ||||
| -rw-r--r-- | config/waagent.conf | 11 |
2 files changed, 20 insertions, 0 deletions
diff --git a/config/99-azure-product-uuid.rules b/config/99-azure-product-uuid.rules new file mode 100644 index 0000000..a5af9b1 --- /dev/null +++ b/config/99-azure-product-uuid.rules @@ -0,0 +1,9 @@ +SUBSYSTEM!="dmi", GOTO="product_uuid-exit" +ATTR{sys_vendor}!="Microsoft Corporation", GOTO="product_uuid-exit" +ATTR{product_name}!="Virtual Machine", GOTO="product_uuid-exit" +TEST!="/sys/devices/virtual/dmi/id/product_uuid", GOTO="product_uuid-exit" + +RUN+="/bin/chmod 0444 /sys/devices/virtual/dmi/id/product_uuid" + +LABEL="product_uuid-exit" + diff --git a/config/waagent.conf b/config/waagent.conf index 6a74125..756eb4d 100644 --- a/config/waagent.conf +++ b/config/waagent.conf @@ -28,6 +28,12 @@ Provisioning.SshHostKeyPairType=rsa # Monitor host name changes and publish changes via DHCP requests. Provisioning.MonitorHostName=y +# Decode CustomData from Base64. +Provisioning.DecodeCustomData=n + +# Execute CustomData after provisioning. +Provisioning.ExecuteCustomData=n + # Format if unformatted. If 'n', resource disk will not be mounted. ResourceDisk.Format=y @@ -55,3 +61,8 @@ OS.RootDeviceScsiTimeout=300 # If "None", the system default version is used. OS.OpensslPath=None + +# If set, agent will use proxy server to access internet +#HttpProxy.Host=None +#HttpProxy.Port=None + |