diff --git a/.etckeeper b/.etckeeper index f8d86af..a3b7a1b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2833,10 +2833,14 @@ maybe chmod 0644 'mke2fs.conf' maybe chmod 0755 'mock' maybe chgrp 'mock' 'mock/alma+epel-8-aarch64.cfg' maybe chmod 0644 'mock/alma+epel-8-aarch64.cfg' +maybe chgrp 'mock' 'mock/alma+epel-8-ppc64le.cfg' +maybe chmod 0644 'mock/alma+epel-8-ppc64le.cfg' maybe chgrp 'mock' 'mock/alma+epel-8-x86_64.cfg' maybe chmod 0644 'mock/alma+epel-8-x86_64.cfg' maybe chgrp 'mock' 'mock/almalinux-8-aarch64.cfg' maybe chmod 0644 'mock/almalinux-8-aarch64.cfg' +maybe chgrp 'mock' 'mock/almalinux-8-ppc64le.cfg' +maybe chmod 0644 'mock/almalinux-8-ppc64le.cfg' maybe chgrp 'mock' 'mock/almalinux-8-x86_64.cfg' maybe chmod 0644 'mock/almalinux-8-x86_64.cfg' maybe chgrp 'mock' 'mock/amazonlinux-2-aarch64.cfg' @@ -3165,8 +3169,6 @@ maybe chgrp 'mock' 'mock/fedora-eln-x86_64.cfg' maybe chmod 0644 'mock/fedora-eln-x86_64.cfg' maybe chgrp 'mock' 'mock/fedora-rawhide-aarch64.cfg' maybe chmod 0644 'mock/fedora-rawhide-aarch64.cfg' -maybe chgrp 'mock' 'mock/fedora-rawhide-armhfp.cfg' -maybe chmod 0644 'mock/fedora-rawhide-armhfp.cfg' maybe chgrp 'mock' 'mock/fedora-rawhide-i386.cfg' maybe chmod 0644 'mock/fedora-rawhide-i386.cfg' maybe chgrp 'mock' 'mock/fedora-rawhide-ppc64le.cfg' diff --git a/.gitignore b/.gitignore index 6b09c6b..e00bb7a 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ mtab.fuselock *.LOCK network/run adjtime +udev/hwdb.bin lvm/cache lvm/archive X11/xdm/authdir/authfiles/* diff --git a/etckeeper/pre-commit.d/30store-metadata b/etckeeper/pre-commit.d/30store-metadata index 7c7f055..b3722ab 100755 --- a/etckeeper/pre-commit.d/30store-metadata +++ b/etckeeper/pre-commit.d/30store-metadata @@ -16,13 +16,13 @@ filter_ignore() { listfile="$( mktemp -t etckeeper-$VCS.XXXXXXXXXX )" case "$VCS" in darcs) - grep -v '^[[:space:]]*\(#\|$\)' "$ignorefile" > "$listfile" || true - grep -Evf "$listfile" + LC_CTYPE=C grep -v '^[[:space:]]*\(#\|$\)' "$ignorefile" > "$listfile" || true + LC_CTYPE=C grep -Evf "$listfile" ;; git) (git ls-files -oi --exclude-standard; git ls-files -oi --exclude-standard --directory) | sort | uniq > "$listfile" || true if [ -s "$listfile" ]; then - sed 's/^\.\///' | grep -xFvf "$listfile" + sed 's/^\.\///' | LC_CTYPE=C grep -xFvf "$listfile" else cat - fi @@ -124,7 +124,7 @@ maybe_chmod_chown() { egid=$(id -g) q="'" while read x; do - stat=$(stat -c "%f:%u:%g:%a:%U:%G" $x) + stat=$(stat -c "%f:%u:%g:%a:%U:%G" "$x") IFS=":" read mode uid gid perm uname gname <