Merging upstream version 20171101.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 40 insertions, 0 deletions

diff --git a/share/hooks/pre-create.git-pull.sh b/share/hooks/pre-create.git-pull.sh
new file mode 100755
index 0000000..cb1d09c
--- /dev/null
+++ b/share/hooks/pre-create.git-pull.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# container-tools - Manage systemd-nspawn containers
+# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+if [ -e /etc/container-tools/debconf/.git ] && [ -e /usr/bin/git ]
+then
+	echo "Updating /etc/container-tools/debconf..."
+
+	if [ -e /etc/default/container-tools ]
+	then
+		. /etc/default/container-tools
+	fi
+
+	DEBCONF_ID="${DEBCONF_ID:-HEAD}"
+
+	cd /etc/container-tools/debconf
+
+	git clean -dfx
+	git checkout -f ${DEBCONF_ID}
+	git pull --rebase
+	echo
+
+	cd "${OLDPWD}"
+fi