diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/build_info.txt | 4 | ||||
| -rw-r--r-- | debian/patches/disable_provisioning.patch | 24 | ||||
| -rw-r--r-- | debian/patches/fixup_setup_file.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
4 files changed, 25 insertions, 8 deletions
diff --git a/debian/patches/build_info.txt b/debian/patches/build_info.txt new file mode 100644 index 0000000..f02ab12 --- /dev/null +++ b/debian/patches/build_info.txt @@ -0,0 +1,4 @@ +serial=20150629 +orig_prefix=trusty-server-cloudimg +suite=trusty +build_name=server diff --git a/debian/patches/disable_provisioning.patch b/debian/patches/disable_provisioning.patch index 08d8ee0..956d30b 100644 --- a/debian/patches/disable_provisioning.patch +++ b/debian/patches/disable_provisioning.patch @@ -1,6 +1,18 @@ --- a/config/waagent.conf +++ b/config/waagent.conf -@@ -14,30 +14,34 @@ +@@ -2,6 +2,11 @@ + # Windows Azure Linux Agent Configuration + # + ++# NOTE: Ubuntu uses Cloud-init for disk-provisioning. This will ++# unless you disable Cloud-init disk provisioning. Please see ++# /usr/share/doc/walinuxagent/99-cloud-init-disable-diskprovisioning.conf ++# ++ + # Specified program is invoked with the argument "Ready" when we report ready status + # to the endpoint server. + Role.StateConsumer=None +@@ -14,19 +19,19 @@ Role.TopologyConsumer=None # Enable instance creation @@ -22,6 +34,11 @@ -Provisioning.MonitorHostName=y +Provisioning.MonitorHostName=n + # Decode CustomData from Base64. + Provisioning.DecodeCustomData=n +@@ -35,14 +40,14 @@ + Provisioning.ExecuteCustomData=n + # Format if unformatted. If 'n', resource disk will not be mounted. -ResourceDisk.Format=y +ResourceDisk.Format=n @@ -34,10 +51,5 @@ -ResourceDisk.MountPoint=/mnt/resource +ResourceDisk.MountPoint=/mnt -+# NOTE: Ubuntu uses Cloud-init for disk-provisioning. This will -+# unless you disable Cloud-init disk provisioning. Please see -+# /usr/share/doc/walinuxagent/99-cloud-init-disable-diskprovisioning.conf -+# # Create and use swapfile on resource disk. ResourceDisk.EnableSwap=n - diff --git a/debian/patches/fixup_setup_file.patch b/debian/patches/fixup_setup_file.patch index 17a29b9..845607d 100644 --- a/debian/patches/fixup_setup_file.patch +++ b/debian/patches/fixup_setup_file.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -52,7 +52,7 @@ +@@ -51,7 +51,7 @@ def initialize_options(self): install.initialize_options(self) diff --git a/debian/patches/series b/debian/patches/series index 60e6520..bddf5a0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ fixup_setup_file.patch cloud-init-default-cfg.patch -disable_provisioning.patch +#disable_provisioning.patch disable-udev-rules.patch fix-waagent-service.patch +disable_provisioning.patch |