daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 19b88ebda0920e36161d74428790c24d4e8c4bcd..5d02328fb0ff9031429d949c0e3850abd7c19ce0 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -788,7 +788,7 @@ maybe chmod 0644 'apt/apt.conf.d/00recommends'
 maybe chmod 0664 'apt/apt.conf.d/00trustcdrom'
 maybe chmod 0644 'apt/apt.conf.d/01-vendor-ubuntu'
 maybe chmod 0644 'apt/apt.conf.d/01autoremove'
-maybe chmod 0644 'apt/apt.conf.d/01autoremove-kernels'
+maybe chmod 0444 'apt/apt.conf.d/01autoremove-kernels'
 maybe chmod 0644 'apt/apt.conf.d/05etckeeper'
 maybe chmod 0644 'apt/apt.conf.d/10periodic'
 maybe chmod 0644 'apt/apt.conf.d/15update-stamp'
@@ -11303,7 +11303,7 @@ maybe chmod 0700 'lvm/archive'
 maybe chmod 0700 'lvm/backup'
 maybe chmod 0600 'lvm/backup/VG-sda1'
 maybe chmod 0600 'lvm/backup/mmc'
-maybe chmod 0644 'lvm/backup/system'
+maybe chmod 0600 'lvm/backup/system'
 maybe chmod 0644 'lvm/lvm.conf'
 maybe chmod 0644 'lvm/lvmlocal.conf'
 maybe chmod 0755 'lvm/profile'

diff --git a/lvm/backup/system b/lvm/backup/system
index 0343bbc602a420b512155cf2c305d2b5a480d781..f776e6b701ad1186d8c48e3c11b9f2459454b19c 100644 (file)
--- a/lvm/backup/system
+++ b/lvm/backup/system
@@ -1,29 +1,16 @@
-<<<<<<< HEAD
-# Generated by LVM2 version 2.02.176(2) (2017-11-03): Mon May  2 00:08:12 2022
-=======
-# Generated by LVM2 version 2.02.176(2) (2017-11-03): Thu Apr 28 11:09:37 2022
->>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
+# Generated by LVM2 version 2.02.176(2) (2017-11-03): Tue May  3 00:08:40 2022
 
 contents = "Text Format Volume Group"
 version = 1
 
-description = "Created *after* executing 'pvscan --cache --activate ay 253:0'"
+description = "Created *after* executing '/sbin/lvremove -y /dev/system/var_backup'"
 
-<<<<<<< HEAD
 creation_host = "homeserver"   # Linux homeserver 4.15.0-20-generic #21-Ubuntu SMP Tue Apr 24 06:16:15 UTC 2018 x86_64
-creation_time = 1651442892     # Mon May  2 00:08:12 2022
+creation_time = 1651529320     # Tue May  3 00:08:40 2022
 
 system {
        id = "5WJluU-PUGx-m4Am-4B5T-wooB-NUG3-dZj5zv"
-       seqno = 1355
-=======
-creation_host = "homeserver"   # Linux homeserver 5.0.0-32-generic #34~18.04.2-Ubuntu SMP Thu Oct 10 10:36:02 UTC 2019 x86_64
-creation_time = 1651136977     # Thu Apr 28 11:09:37 2022
-
-system {
-       id = "5WJluU-PUGx-m4Am-4B5T-wooB-NUG3-dZj5zv"
-       seqno = 1307
->>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
+       seqno = 1367
        format = "lvm2"                 # informational
        status = ["RESIZEABLE", "READ", "WRITE"]
        flags = []