diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-09-28 19:14:30 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-09-28 19:14:30 +0000 |
| commit | 1fd5f07de3c28f3a1aa9d39b956411e69f39203b (patch) | |
| tree | a3f99cce9110cfedd04e3dbd5a28ab3cb746e4b0 | |
| parent | Releasing debian version 20210926-2. (diff) | |
| download | open-infrastructure-service-tools-1fd5f07de3c28f3a1aa9d39b956411e69f39203b.tar.xz open-infrastructure-service-tools-1fd5f07de3c28f3a1aa9d39b956411e69f39203b.zip | |
Merging upstream version 20210928.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | CHANGELOG.txt | 8 | ||||
| -rw-r--r-- | VERSION.txt | 2 | ||||
| -rwxr-xr-x | dehydrated/bin/dehydrated-cron | 3 | ||||
| -rwxr-xr-x | git/bin/git-repo-repack | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8a26178..cf850f3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,11 @@ +2021-09-28 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing version 20210928. + + [ Daniel Baumann ] + * Changing variable usage and quoting for 'git gc' options to fix git-repo-repack with newer git versions. + * Actually run dehydrated in dehydrated-cron. + 2021-09-26 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 20210926. diff --git a/VERSION.txt b/VERSION.txt index c2d5f99..fbdb929 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20210926 +20210928 diff --git a/dehydrated/bin/dehydrated-cron b/dehydrated/bin/dehydrated-cron index 8264761..8e7904c 100755 --- a/dehydrated/bin/dehydrated-cron +++ b/dehydrated/bin/dehydrated-cron @@ -22,5 +22,8 @@ set -e mkdir -p /var/log/dehydrated + +dehydrated -c >> /var/log/dehydrated/dehydrated.log dehydrated -gcd >> /var/log/dehydrated/dehydrated.log + chown -R root:adm /var/log/dehydrated diff --git a/git/bin/git-repo-repack b/git/bin/git-repo-repack index 0d3c106..58f909d 100755 --- a/git/bin/git-repo-repack +++ b/git/bin/git-repo-repack @@ -51,7 +51,7 @@ do cd "${REPOSITORY}" git repack "${GIT_REPACK_OPTIONS}" -a -b -d -f -F - git gc "${GIT_GC_OPTIONS}" --aggressive --prune + git gc --aggressive --prune ${GIT_GC_OPTIONS} cd "${OLDPWD}" if [ "$(id -u)" -eq "0" ] |