diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-02-27 13:02:06 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-02-27 13:02:06 -0500 |
| commit | 6a72a8677ad2e4e66669d2be93880643b0525b51 (patch) | |
| tree | 0f8e629b342041c1ff70903b5d709b039da71de2 /cloudinit/handlers | |
| parent | d4886b65549c886499141872a9928412a74bbea2 (diff) | |
| download | vyos-cloud-init-6a72a8677ad2e4e66669d2be93880643b0525b51.tar.gz vyos-cloud-init-6a72a8677ad2e4e66669d2be93880643b0525b51.zip | |
do not reload upstart configuration on upstart jobs
For now, we disable reloading upstart jobs due to bug 1124384.
At some point in the future, we could enable it again when that
bug is fixed.
The change here allows for a boothook in a multipart input to write the
file '/run/cloud-init-upstart-reload' and then have configuration
reloaded.
Diffstat (limited to 'cloudinit/handlers')
| -rw-r--r-- | cloudinit/handlers/upstart_job.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cloudinit/handlers/upstart_job.py b/cloudinit/handlers/upstart_job.py index 4684f7f2..0aa7446e 100644 --- a/cloudinit/handlers/upstart_job.py +++ b/cloudinit/handlers/upstart_job.py @@ -65,6 +65,14 @@ class UpstartJobPartHandler(handlers.Handler): path = os.path.join(self.upstart_dir, filename) util.write_file(path, payload, 0644) - # if inotify support is not present in the root filesystem - # (overlayroot) then we need to tell upstart to re-read /etc - util.subp(["initctl", "reload-configuration"], capture=False) + # FIXME LATER (LP: #1124384) + # a bug in upstart means that invoking reload-configuration + # at this stage in boot causes havoc. So, until that is fixed + # we will not do that. However, I'd like to be able to easily + # test to see if this bug is still present in an image with + # a newer upstart. So, a boot hook could easiliy write this file. + if os.path.exists("/run/cloud-init-upstart-reload"): + # if inotify support is not present in the root filesystem + # (overlayroot) then we need to tell upstart to re-read /etc + + util.subp(["initctl", "reload-configuration"], capture=False) |