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

Merge pull request #25573 from EvaSDK/2015.5.3-lxc-fixes

Browse source 
Do not execute bootstrap script twice
This commit is contained in:
Justin Findlay 2015-07-21 12:20:03 -06:00
commit df74f2c3ad
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/lxc.py
View file

@ -3190,7 +3190,7 @@ def bootstrap(name,
if needs_install or force_install or unconditional_install:
if install:
rstr = __salt__['test.rand_str']()
configdir = '/tmp/.c_{0}'.format(rstr)
configdir = '/var/tmp/.c_{0}'.format(rstr)
cmd = 'install -m 0700 -d {0}'.format(configdir)
if run(name, cmd, python_shell=False):
@ -3203,7 +3203,7 @@ def bootstrap(name,
script = '/sbin/{0}_bootstrap.sh'.format(rstr)
cp(name, bs_, script)
result = run_all(name,
'sh -c "chmod +x {0};{0}"'''.format(script),
'sh -c "chmod +x {0}"'.format(script),
python_shell=True)
cp(name, cfg_files['config'],