From 3292686e33ec0c7a0302e0dfd7539e7f2ad361ef Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sat, 24 Nov 2018 16:28:57 +0400 Subject: [PATCH 1/6] =?UTF-8?q?EnsureVM:=20ne=20plus=20chercher=20=C3=A0?= =?UTF-8?q?=20d=C3=A9charger=20les=20modules=20par=20d=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EnsureVM | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/EnsureVM b/EnsureVM index ff012dc..bb86f1e 100755 --- a/EnsureVM +++ b/EnsureVM @@ -17,7 +17,7 @@ function ensure_kvm() { # sont chargés, et que le service libvirt-bin est démarré local module modified - if [ -z "$check_only" ]; then + if [ -z "$check_only" -a -n "$exclusive" ]; then # Vérifier que les modules vbox* sont déchargés for module in vboxpci vboxnetadp vboxnetflt vboxdrv; do if lsmod | quietgrep "$module"; then @@ -82,7 +82,7 @@ function ensure_virtualbox() { # sont chargés, et que le service vboxdrv est démarré local module modified - if [ -z "$check_only" ]; then + if [ -z "$check_only" -a -n "$exclusive" ]; then # Vérifier que kvm{,_intel,_amd} ne sont pas chargés for module in kvm_intel kvm_amd kvm; do if lsmod | quietgrep "$module"; then @@ -117,9 +117,12 @@ function ensure_virtualbox() { } check_only= +exclusive=1 parse_opts + "${PRETTYOPTS[@]}" \ --help '$exit_with display_help' \ -c,--check-only,--check check_only=1 \ + -x,--exclusive exclusive=1 \ + -s,--shared exclusive= \ @ args -- "$@" && set -- "${args[@]}" || die "$args" run_as_root "$@" From 45d912d4954cac89f59f430a5afbd9f1ba156d7c Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 27 Nov 2018 23:15:04 +0400 Subject: [PATCH 2/6] =?UTF-8?q?EnsureVM:=20=C3=AAtre=20en=20mode=20shared?= =?UTF-8?q?=20par=20d=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EnsureVM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EnsureVM b/EnsureVM index bb86f1e..7789701 100755 --- a/EnsureVM +++ b/EnsureVM @@ -117,7 +117,7 @@ function ensure_virtualbox() { } check_only= -exclusive=1 +exclusive= parse_opts + "${PRETTYOPTS[@]}" \ --help '$exit_with display_help' \ -c,--check-only,--check check_only=1 \ From d70825c29663ed2f1bc91b33fccd8367ec60df91 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sat, 1 Dec 2018 23:04:28 +0400 Subject: [PATCH 3/6] =?UTF-8?q?dk:=20bug=20dans=20la=20d=C3=A9finition=20d?= =?UTF-8?q?u=20service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dk b/dk index b7a2330..4f5c99d 100755 --- a/dk +++ b/dk @@ -317,6 +317,8 @@ function auto_service() { cat >/etc/systemd/system/$container_name.service < Date: Fri, 7 Dec 2018 16:04:18 +0400 Subject: [PATCH 4/6] =?UTF-8?q?dk:=20s'assurer=20que=20docker-compose=20et?= =?UTF-8?q?=20docker=20existent=20quand=20on=20cr=C3=A9e=20le=20service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dk b/dk index 4f5c99d..2ba7202 100755 --- a/dk +++ b/dk @@ -267,6 +267,13 @@ function auto_up() { function default_compose_service() { local docker_compose="$(which docker-compose)" + if [ -z "$docker_compose" -a -x /usr/bin/docker-compose ]; then + docker_compose=/usr/bin/docker-compose + elif [ -z "$docker_compose" -a -x /usr/local/bin/docker-compose ]; then + docker_compose=/usr/local/bin/docker-compose + else + die "Impossible de trouver docker-compose" + fi setx startcmd=qvals "$docker_compose" \ "${replace_env_args[@]}" "${env_args[@]}" \ up "${replace_run_args[@]}" "${run_args[@]}" \ @@ -275,6 +282,13 @@ function default_compose_service() { } function default_docker_service() { local docker="$(which docker)" + if [ -z "$docker" -a -x /usr/bin/docker ]; then + docker=/usr/bin/docker + elif [ -z "$docker" -a -x /usr/local/bin/docker ]; then + docker=/usr/local/bin/docker + else + die "Impossible de trouver docker" + fi setx startcmd=qvals "$docker" run \ "${replace_env_args[@]}" "${env_args[@]}" \ "${replace_run_args[@]}" "${run_args[@]}" \ From 71bb5aaaec2a5faaefc90598181b7e97a2f1c496 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sat, 8 Dec 2018 11:57:53 +0400 Subject: [PATCH 5/6] bug --- lib/profile.d/bash_prompt.shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/profile.d/bash_prompt.shared b/lib/profile.d/bash_prompt.shared index 0070b2b..2631a58 100644 --- a/lib/profile.d/bash_prompt.shared +++ b/lib/profile.d/bash_prompt.shared @@ -130,7 +130,7 @@ fi eval "$GENERATE_PS1" ' ;; - screen) + screen*) PROMPT_COMMAND=' if [ -n "$UTOOLS_AUTO" ]; then echo -ne "\033_[screen] ${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~} $(if [ -f build.properties ]; then From 49c8e756e629ca52e57b88fccfef1382aae3fff6 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sat, 8 Dec 2018 11:58:23 +0400 Subject: [PATCH 6/6] Init changelog & version 9.2.0 --- CHANGES.md | 8 ++++++++ VERSION.txt | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c44af77..fea0d3b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,11 @@ +## Version 9.2.0 du 08/12/2018-11:58 + +* `71bb5aa` bug +* `44b1954` dk: s'assurer que docker-compose et docker existent quand on crée le service +* `d70825c` dk: bug dans la définition du service +* `45d912d` EnsureVM: être en mode shared par défaut +* `3292686` EnsureVM: ne plus chercher à décharger les modules par défaut + ## Version 9.1.0 du 22/11/2018-15:40 * `ba29496` dk: génération d'un service systemd diff --git a/VERSION.txt b/VERSION.txt index 47da986..deeb3d6 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -9.1.0 +9.2.0