saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

lxc: remove merge cruft

Browse source 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
This commit is contained in:
Mathieu Le Marec - Pasquet 2015-05-20 21:41:12 +02:00
parent 725b0462ca
commit 139372c055
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/lxc.py
View file

@ -1369,10 +1369,6 @@ def init(name,
chunks = read_conf(path, out_format='commented')
if old_chunks != chunks:
to_reboot = True
if remove_seed_marker:
run(name,
'rm -f \'{0}\''.format(SEED_MARKER),
python_shell=False)
# last time to be sure any of our property is correctly applied
cfg = _LXCConfig(name=name, network_profile=network_profile,
@ -1405,6 +1401,12 @@ def init(name,
ret['changes'] = changes_dict
return ret
if remove_seed_marker:
run(name,
'rm -f \'{0}\''.format(SEED_MARKER),
chroot_fallback=False,
python_shell=False)
# set the default user/password, only the first time
if ret.get('result', True) and password:
gid = '/.lxc.initial_pass'