From a3f0bf2ffaa0a4241b9e74aea2a201bdc33424cc Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Tue, 1 Feb 2011 15:46:10 -0500
Subject: fix the path for user scripts.

A bug caused user scripts to get stored in
/var/lib/cloud/instance/scripts/<instance-id>/

which meant they would not get run by 'run-user-scripts'.

LP: #711480
---
 cloudinit/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py
index 9384bf11..ce4f94b3 100644
--- a/cloudinit/__init__.py
+++ b/cloudinit/__init__.py
@@ -393,8 +393,8 @@ class CloudInit:
 
         filename=filename.replace(os.sep,'_')
         scriptsdir = get_ipath_cur('scripts')
-        util.write_file("%s/%s/%s" % 
-            (scriptsdir,self.get_instance_id(),filename), payload, 0700)
+        util.write_file("%s/%s" % 
+            (scriptsdir,filename), payload, 0700)
 
     def handle_upstart_job(self,data,ctype,filename,payload):
         if ctype == "__end__" or ctype == "__begin__": return
-- 
cgit v1.2.3