From 17ac3a3a36db5dfa2f8794e302141a7920c2c57a Mon Sep 17 00:00:00 2001
From: Jeremy Dubois <jdubois@evolix.fr>
Date: Thu, 30 Jun 2022 17:53:06 +0200
Subject: [PATCH] etc-git: ansible-commit upstream release 22.05

---
 roles/etc-git/files/ansible-commit | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/roles/etc-git/files/ansible-commit b/roles/etc-git/files/ansible-commit
index 20ab3a9..d22f4a6 100644
--- a/roles/etc-git/files/ansible-commit
+++ b/roles/etc-git/files/ansible-commit
@@ -2,7 +2,7 @@
 
 set -u
 
-VERSION="22.04.1"
+VERSION="22.05"
 
 show_version() {
     cat <<END
@@ -31,6 +31,7 @@ Usage: ansible-commit --message "add new host"
 
 Options
      --message MESSAGE   set the commit message
+     --no-lxc            disable commit inside LXC containers
  -V, --version           print version number
  -v, --verbose           increase verbosity
  -n, --dry-run           actions are not executed
@@ -81,7 +82,7 @@ main() {
         fi
     fi
 
-    if [ -n "${lxc_ls_bin}" ]; then
+    if [ "${LXC}" = "1" ] && [ -n "${lxc_ls_bin}" ]; then
         for container in $(${lxc_ls_bin} -1); do
             if [ -n "${lxc_config_bin}" ]; then
                 # discovered path
@@ -136,6 +137,9 @@ while :; do
             printf 'FAILED: "--message" requires a non-empty option argument.\n' >&2
             exit 1
             ;;
+        --no-lxc)
+            LXC=0
+            ;;
         -n|--dry-run)
             # disable actual commands
             DRY_RUN=1
@@ -169,6 +173,7 @@ if [ -z "${MESSAGE}" ]; then
 fi
 DRY_RUN=${DRY_RUN:-0}
 VERBOSE=${VERBOSE:-0}
+LXC=${LXC:-1}
 
 evocommit_bin=$(command -v evocommit)
 if [ -z "${evocommit_bin}" ]; then