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 4

Dereference symlinks to set proper __cli

Browse source
This commit is contained in:
vzhestkov 2023-10-20 14:11:18 +02:00 • committed by Daniel Wozniak
parent 19a1edc3a1
commit 2fea093052
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/config/__init__.py
View file

@ -3762,7 +3762,9 @@ def apply_minion_config(
)
opts["fileserver_backend"][idx] = new_val
opts["__cli"] = salt.utils.stringutils.to_unicode(os.path.basename(sys.argv[0]))
opts["__cli"] = salt.utils.stringutils.to_unicode(
os.path.basename(salt.utils.path.expand(sys.argv[0]))
)
# No ID provided. Will getfqdn save us?
using_ip_for_id = False
@ -3964,7 +3966,9 @@ def apply_master_config(overrides=None, defaults=None):
)
opts["keep_acl_in_token"] = True
opts["__cli"] = salt.utils.stringutils.to_unicode(os.path.basename(sys.argv[0]))
opts["__cli"] = salt.utils.stringutils.to_unicode(
os.path.basename(salt.utils.path.expand(sys.argv[0]))
)
if "environment" in opts:
if opts["saltenv"] is not None: