From 40c92e9a3a19434ea04e64d2bd28eccca1ede3a6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 31 Oct 2017 17:46:45 +0100 Subject: Adding container create pre-hook that can be used to automatically git pull /etc/container-tools/debconf. Signed-off-by: Daniel Baumann --- Makefile | 2 +- share/hooks/pre-create.git-pull.sh | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100755 share/hooks/pre-create.git-pull.sh diff --git a/Makefile b/Makefile index 030a9fb..6ee40cb 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ install: build cp -r lib/* $(DESTDIR)/usr/lib/$(SOFTWARE) mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE) - cp -r VERSION.txt share/config share/scripts ${DESTDIR}/usr/share/$(SOFTWARE) + cp -r VERSION.txt share/config share/hooks share/scripts ${DESTDIR}/usr/share/$(SOFTWARE) mkdir -p $(DESTDIR)/usr/share/bash-completion/completions cp -r share/bash-completion/* $(DESTDIR)/usr/share/bash-completion/completions 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 +# +# 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 . + +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 -- cgit v1.2.3