From 2fea09305272562857b4b5afc2e19e9c076dea74 Mon Sep 17 00:00:00 2001 From: vzhestkov Date: Fri, 20 Oct 2023 14:11:18 +0200 Subject: [PATCH] Dereference symlinks to set proper __cli --- salt/config/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/salt/config/__init__.py b/salt/config/__init__.py index 48599f123e6..14aa7061a92 100644 --- a/salt/config/__init__.py +++ b/salt/config/__init__.py @@ -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: