Merge branch 'add-option-no-lockfile' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-add-option-no-lockfile

Signed-off-by: Richard T Bonhomme <[email protected]>

Author: TinCanTech

ChangeLog

@@ -2,6 +2,7 @@ Easy-RSA 3 ChangeLog
 
 3.2.4 (TBD)
 
+   * New global option: --no-lockfile = env-var: $EASYRSA_NO_LOCKFILE (46c8647) (#1364)
    * default_overview(): Add peer-fingerprint mode PKI identification (c9a0152) (#1363)
    * help: Add in use algorithm and key-size/curve to top level status (10778cc) (#1363)
    * help: Move 'utils' to command list and detailed help (e965234) (#1363)

easyrsa3/easyrsa

@@ -43,6 +43,7 @@ Global options:
 --force-safe-ssl: Always generate a safe SSL config file
                   (Default: Generate Safe SSL config once per instance)
 
+--no-lockfile   : Disable lock-file (Useful for read-only PKI)
 --tmp-dir=DIR   : Declare the temporary directory
                   (Default temporary directory is the EasyRSA PKI directory)
 --keep-tmp=NAME : Keep the original temporary session by name: NAME
@@ -5785,7 +5786,7 @@ verify_working_env() {
 	verbose "verify_working_env: BEGIN"
 
 	# Oppertunist PKI lock-file
-	request_lock_file
+	[ "$EASYRSA_NO_LOCKFILE" ] || request_lock_file
 
 	# For commands which 'require a PKI' and PKI exists
 	if [ "$require_pki" ]; then
@@ -6703,6 +6704,10 @@ while :; do
 		--pki-dir|--pki)
 			export EASYRSA_PKI="$val"
 			;;
+		--no-lockfile)
+			empty_ok=1
+			export EASYRSA_NO_LOCKFILE=1
+			;;
 		--tmp-dir)
 			export EASYRSA_TEMP_DIR="$val"
 			;;