From 78186f48d3c403ed0eb52b6415b3785584c772fc Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@canonical.com>
Date: Sat, 27 Jun 2009 20:07:35 +0200
Subject: Rely on the lockfile handling in the init script, and let
 ec2-run-user-data just do its thing.

---
 ec2-run-user-data.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/ec2-run-user-data.py b/ec2-run-user-data.py
index 8e16cefd..51e0d68d 100755
--- a/ec2-run-user-data.py
+++ b/ec2-run-user-data.py
@@ -31,23 +31,10 @@ content_type_handlers = { 'text/x-shellscript' : handle_shell_script,
 def main():
     ec2 = ec2init.EC2Init()
 
-    semaphore = '/var/lib/ec2/already-ran.%s' % amiId
-    amiId = ec2.get_ami_id()
-
-    if os.path.exists(semaphore):
-        print "ec2-run-user-data already ran for this instance."
-        return 0
-
     user_data = ec2.get_user_data()
 
     msg = email.message_from_string(user_data)
-    if msg.is_multipart():
-        handle_part(msg)
-    else:
-        handle_payload(user_data)
-
-    # Touch the semaphore file
-    file(semaphore, 'a').close()
+    handle_part(msg)
 
 def handle_part(part):
     if part.is_multipart():
-- 
cgit v1.2.3