diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-07 16:27:47 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-07 16:27:47 -0500 |
| commit | 3199df6e1489da03d51ac8a2a4574c27fd325189 (patch) | |
| tree | 921700212c063d1b468a8ea2cac4f7df0f3a68d9 /cloudinit/handlers | |
| parent | 21aec9e44c27b9bf1c96314f0449fd39793d1c73 (diff) | |
| parent | 8013c284e82349246b2274f5475c138323fd7c55 (diff) | |
| download | vyos-cloud-init-3199df6e1489da03d51ac8a2a4574c27fd325189.tar.gz vyos-cloud-init-3199df6e1489da03d51ac8a2a4574c27fd325189.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/handlers')
| -rw-r--r-- | cloudinit/handlers/upstart_job.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cloudinit/handlers/upstart_job.py b/cloudinit/handlers/upstart_job.py index a5cb9b0c..3d8833a1 100644 --- a/cloudinit/handlers/upstart_job.py +++ b/cloudinit/handlers/upstart_job.py @@ -64,3 +64,15 @@ class UpstartJobPartHandler(handlers.Handler): payload = util.dos2unix(payload) path = os.path.join(self.upstart_dir, filename) util.write_file(path, payload, 0644) + + # 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) |