diff options
Diffstat (limited to 'cloudinit/DataSourceNoCloud.py')
| -rw-r--r-- | cloudinit/DataSourceNoCloud.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/cloudinit/DataSourceNoCloud.py b/cloudinit/DataSourceNoCloud.py index cd988d08..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 @@ -108,16 +108,10 @@ class DataSourceNoCloud(DataSource.DataSource): # root=LABEL=uec-rootfs ro ds=nocloud def parse_cmdline_data(ds_id,fill,cmdline=None): if cmdline is None: - if 'DEBUG_PROC_CMDLINE' in os.environ: - cmdline = os.environ["DEBUG_PROC_CMDLINE"] - else: - cmdfp = open("/proc/cmdline") - cmdline = cmdfp.read().strip() - cmdfp.close() - cmdline = " %s " % cmdline.lower() - - if not ( " %s " % ds_id in cmdline or " %s;" % ds_id in cmdline ): - return False + cmdline = util.get_cmdline() + + if not ( " %s " % ds_id in cmdline or " %s;" % ds_id in cmdline ): + return False argline="" # cmdline can contain: @@ -149,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' |