diff options
| author | Scott Moser <smoser@ubuntu.com> | 2010-01-28 15:49:29 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2010-01-28 15:49:29 -0500 |
| commit | f8eb4061196c8c2489ac7bf084e0fc0d3e6d27fc (patch) | |
| tree | cf124cde80f291930a626874fb38b64661ee8315 /ec2-init.py | |
| parent | eb74cd6f36a2f4d2ebdee04d6b388834b1bc72d4 (diff) | |
| download | vyos-cloud-init-f8eb4061196c8c2489ac7bf084e0fc0d3e6d27fc.tar.gz vyos-cloud-init-f8eb4061196c8c2489ac7bf084e0fc0d3e6d27fc.zip | |
Add support for user defined mount points
Also, move swap to use this format for specifying mounts. That way
the user can turn off swap if they want with:
| mounts:
| - [ swap ]
Other change wrapped in here is to have DataSourceEc2 read plain text
(evalable) text for its metadata rather than pickl. This is really for
debuging anyway, so any speed difference is not important.
Diffstat (limited to 'ec2-init.py')
| -rwxr-xr-x | ec2-init.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/ec2-init.py b/ec2-init.py index 7597e9c6..06662f7b 100755 --- a/ec2-init.py +++ b/ec2-init.py @@ -41,16 +41,6 @@ def main(): except: warn("failed to set defaults\n") - # enable swap - try: - cloud.sem_and_run("enable_swap", "once-per-instance", - cloud.enable_swap,[],False) - except: - import traceback - traceback.print_exc(file=sys.stderr) - warn("enabling swap failed!\n") - - # finish, send the cloud-config event cloud.initctl_emit() |