diff options
author | Scott Moser <smoser@ubuntu.com> | 2011-01-24 14:55:45 -0500 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2011-01-24 14:55:45 -0500 |
commit | 0ef850f81aa3f652ecf1e869ad0de622695782d8 (patch) | |
tree | fe42f6a15de8d0d3145752a156c0db92ba161d45 /cloudinit/__init__.py | |
parent | b9b0a79b5a1b142b9e1176d64f294cf9c9f84157 (diff) | |
parent | 516e378f0e79d127baeac8c6418efc504d3b713e (diff) | |
download | vyos-cloud-init-0ef850f81aa3f652ecf1e869ad0de622695782d8.tar.gz vyos-cloud-init-0ef850f81aa3f652ecf1e869ad0de622695782d8.zip |
move cloud-run-user-script.conf to cloud-final, use cloud-cfg for invoking
This moves what was done as cloud-run-user-script.conf to 'cloud-final'
and makes that re-use the cloud-init-cfg code, but simply with a different
set of default configs.
Also, adds keys_to_console and final_message cloud-config modules
Diffstat (limited to 'cloudinit/__init__.py')
-rw-r--r-- | cloudinit/__init__.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py index d5180c05..1786cc2f 100644 --- a/cloudinit/__init__.py +++ b/cloudinit/__init__.py @@ -20,6 +20,7 @@ varlibdir = '/var/lib/cloud' cur_instance_link = varlibdir + "/instance" +boot_finished = cur_instance_link + "/boot-finished" system_config = '/etc/cloud/cloud.cfg' seeddir = varlibdir + "/seed" cfg_env_name = "CLOUD_CFG" @@ -509,12 +510,15 @@ def initfs(): util.chownbyname(log_file, u, g) def purge_cache(): - try: - os.unlink(cur_instance_link) - except OSError as e: - if e.errno != errno.ENOENT: return(False) - except: - return(False) + rmlist = ( boot_finished , cur_instance_link ) + for f in rmlist: + try: + os.unlink(f) + except OSError as e: + if e.errno == errno.ENOENT: continue + return(False) + except: + return(False) return(True) # get_ipath_cur: get the current instance path for an item |