diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-01-19 16:11:55 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-01-19 16:11:55 -0500 |
| commit | 7a187863644c0a5baf2c72c3029621677cbb56c6 (patch) | |
| tree | 9789fc61a6af27cb3d3d7c6da64193767fccb1d7 /cloudinit/DataSourceNoCloud.py | |
| parent | 738766778c88bcfe692f8df17f91c4d5c6c90cdd (diff) | |
| parent | f2cb6fa249c0f9a17aa8efd27749860622fd8ae1 (diff) | |
| download | vyos-cloud-init-7a187863644c0a5baf2c72c3029621677cbb56c6.tar.gz vyos-cloud-init-7a187863644c0a5baf2c72c3029621677cbb56c6.zip | |
pull in the rework of /var/lib/cloud.
- /var/lib/cloud is redesigned, and its layout now described in
doc/var-lib-cloud.txt.
The big plus point of this was to get instance specific data
into /var/lib/cloud/instances, so that data could easily be purged.
A symlink /var/lib/cloud/instance -> /var/lib/cloud/instances/<current_id>
is maintained.
- Also, now run scripts in /var/lib/cloud/scripts/
per-once
per-boot
per-instance
- bugs addressed:
- LP: #704509
Diffstat (limited to 'cloudinit/DataSourceNoCloud.py')
| -rw-r--r-- | cloudinit/DataSourceNoCloud.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/DataSourceNoCloud.py b/cloudinit/DataSourceNoCloud.py index 78c9c9c8..2f6033a9 100644 --- a/cloudinit/DataSourceNoCloud.py +++ b/cloudinit/DataSourceNoCloud.py @@ -32,7 +32,7 @@ class DataSourceNoCloud(DataSource.DataSource): supported_seed_starts = ( "/" , "file://" ) seed = None cmdline_id = "ds=nocloud" - seeddir = cloudinit.cachedir + '/nocloud' + seeddir = cloudinit.seeddir + '/nocloud' def __init__(self): pass @@ -143,4 +143,4 @@ def parse_cmdline_data(ds_id,fill,cmdline=None): class DataSourceNoCloudNet(DataSourceNoCloud): cmdline_id = "ds=nocloud-net" supported_seed_starts = ( "http://", "https://", "ftp://" ) - seeddir = cloudinit.cachedir + '/nocloud-net' + seeddir = cloudinit.seeddir + '/nocloud-net' |