forcemerge 884824 904924
severity 884824 important
tags 884824 patch
block 883263 by 884824
thanks

Hi there,

On Wed, 20 Dec 2017 14:30:42 +1100, Martin Schwenke wrote:
> Following a suggestion, I found that if I run:
> 
>   systemctl stop etckeeper.timer

The systemd timer was activated just before you filed your report:

  <https://bugs.debian.org/883263>

And I got hit as well since 2 days, i.e. since I upgraded my **work**
machine from stretch to buster.

> Then it is no longer listed by "systemctl list-units".
> 
> I should have spent more time reading systemctl(1):

Nope, this is a bug in the /etc/etckeeper/daily shell script, which
does not respect /etc/etckeeper/etckeeper.conf, the patch is simple:
=====
root@harlock:/etc# git log -1
commit 22dae914f53724d6bd36cd7c4fdd8d03f41f6c97 (HEAD -> master)
Author: root <r...@harlock.unige.ch>
Date:   Wed Nov 20 18:49:56 2019 +0100

    daily autocommit
root@harlock:/etc# git reset 8454274b14e8401f0d2f7f23973d13f971ee79a9
Unstaged changes after reset:
M        cron.daily/local_report-pointage.sh
M        etckeeper/daily
M        fstab
M        iptables/rules.v4
root@harlock:/etc# git diff etckeeper/daily
diff --git a/etckeeper/daily b/etckeeper/daily
index f98c6ad..2d291c7 100755
--- a/etckeeper/daily
+++ b/etckeeper/daily
@@ -2,6 +2,10 @@
 # Script that can be run daily to autocommit /etc changes.
 set -e
 if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
+       ## <https://bugs.debian.org/884824>
+       . /etc/etckeeper/etckeeper.conf
+       [ ${AVOID_DAILY_AUTOCOMMITS} -eq 0 ] || exit 0
+
        # avoid autocommit if an install run is in progress
        lockfile=/var/cache/etckeeper/packagelist.pre-install
        if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then
root@harlock:/etc# bash -x etckeeper/daily 
+ set -e
+ '[' -x /usr/bin/etckeeper ']'
+ '[' -e /etc/etckeeper/etckeeper.conf ']'
+ . /etc/etckeeper/etckeeper.conf
++ VCS=git
++ GIT_COMMIT_OPTIONS=
++ HG_COMMIT_OPTIONS=
++ BZR_COMMIT_OPTIONS=
++ DARCS_COMMIT_OPTIONS=-a
++ AVOID_DAILY_AUTOCOMMITS=1
++ AVOID_COMMIT_BEFORE_INSTALL=1
++ HIGHLEVEL_PACKAGE_MANAGER=apt
++ LOWLEVEL_PACKAGE_MANAGER=dpkg
++ PUSH_REMOTE=
+ '[' 1 -eq 0 ']'
+ exit 0
root@harlock:/etc# git status
On branch master
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

  modified:   cron.daily/local_report-pointage.sh
  modified:   etckeeper/daily
  modified:   fstab
  modified:   iptables/rules.v4

no changes added to commit (use "git add" and/or "git commit -a")
root@harlock:/etc# 
=====

Thx, bye,
Gismo / Luca

-- 
Dr. Luca Capello
Ingénieur HPC
Division du Système et des Technologies de l'Information et de la Communication
Université de Genève | 24 rue Général-Dufour
Tél +41 22 379 72 42 | Bureau 151
https://hpc-community.unige.ch
mailto:luca.cape...@unige.ch

Attachment: signature.asc
Description: PGP signature

Reply via email to