From 7bc6bbe8c4475151ee196ced344d1f045486bc1f Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 14 Dec 2009 16:17:41 -0500 Subject: sync karmic and trunk This commit merges lp:~soren/ec2-init/0.5 at rev 67 and lp:ubuntu/lucid at 0.4.999-0ubuntu8 --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f7d48311..d5f9de19 100755 --- a/setup.py +++ b/setup.py @@ -34,10 +34,11 @@ setup(name='EC2-init', 'ec2-run-user-data.py', 'ec2-set-defaults.py', 'ec2-set-hostname.py', - 'ec2-wait-for-meta-data-service.py'], + 'ec2-wait-for-meta-data-service.py', + 'ec2-is-compat-env'], data_files=[('/etc/ec2-init', ['ec2-config.cfg']), ('/etc/ec2-init/templates', glob('templates/*')), - ('/etc/init.d', ['ec2-init']), + ('/etc/init.d', ['ec2-init', 'ec2-init-user-data']), ('/usr/share/ec2-init', ['ec2-init-appliance-ebs-volume-mount.sh']), ], ) -- cgit v1.2.3