File bin_loc.patch of Package aws-efs-utils

Overview Repositories Revisions Requests Users Attributes Meta

File bin_loc.patch of Package aws-efs-utils

Summary: use absolute binary path to fix discoverability issue with stunnel.
Index: efs-utils-1.7/src/mount_efs/__init__.py
===================================================================
--- efs-utils-1.7.orig/src/mount_efs/__init__.py
+++ efs-utils-1.7/src/mount_efs/__init__.py
@@ -238,7 +238,12 @@ def is_stunnel_option_supported(stunnel_
 
 
 def get_version_specific_stunnel_options(config):
-    proc = subprocess.Popen(['stunnel', '-help'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+    proc = subprocess.Popen(
+        ['/usr/sbin/stunnel', '-help'],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        close_fds=True
+    )
     proc.wait()
     _, err = proc.communicate()
 
@@ -418,7 +423,7 @@ def bootstrap_tls(config, init_system, d
 
     stunnel_config_file = write_stunnel_config_file(config, state_file_dir, fs_id, mountpoint, tls_port, dns_name, verify_level)
 
-    tunnel_args = ['stunnel', stunnel_config_file]
+    tunnel_args = ['/usr/sbin/stunnel', stunnel_config_file]
 
     # launch the tunnel in a process group so if it has any child processes, they can be killed easily by the mount watchdog
     logging.info('Starting TLS tunnel: "%s"', ' '.join(tunnel_args))
Index: efs-utils-1.7/test/mount_efs_test/test_bootstrap_tls.py
===================================================================
--- efs-utils-1.7.orig/test/mount_efs_test/test_bootstrap_tls.py
+++ efs-utils-1.7/test/mount_efs_test/test_bootstrap_tls.py
@@ -57,7 +57,7 @@ def test_bootstrap_tls_state_file_dir_ex
     args, _ = popen_mock.call_args
     args = args[0]
 
-    assert 'stunnel' in args
+    assert '/usr/sbin/stunnel' in args
     assert EXPECTED_STUNNEL_CONFIG_FILE in args
 
 
@@ -94,7 +94,7 @@ def test_bootstrap_tls_non_default_port(
     args, _ = popen_mock.call_args
     args = args[0]
 
-    assert 'stunnel' in args
+    assert '/usr/sbin/stunnel' in args
     assert EXPECTED_STUNNEL_CONFIG_FILE in args
 
 
@@ -110,5 +110,6 @@ def test_bootstrap_tls_non_default_verif
     args, _ = popen_mock.call_args
     args = args[0]
 
-    assert 'stunnel' in args
+    assert '/usr/sbin/stunnel' in args
     assert EXPECTED_STUNNEL_CONFIG_FILE in args
+

Places

File bin_loc.patch of Package aws-efs-utils

Places