From e85c6a9066447bbe44198de332fdc7511cc00972 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 21 Apr 2022 07:16:33 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 2 -- .../libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a | 11 ----------- ...ibvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a.files | 12 ------------ cups/printers.conf | 2 +- cups/printers.conf.O | 2 +- resolv.conf | 9 +++++---- 6 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 apparmor.d/libvirt/libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a delete mode 100644 apparmor.d/libvirt/libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a.files diff --git a/.etckeeper b/.etckeeper index 4d0018b..6b3b6e6 100755 --- a/.etckeeper +++ b/.etckeeper @@ -390,8 +390,6 @@ maybe chmod 0755 'apparmor.d/force-complain' maybe chmod 0755 'apparmor.d/libvirt' maybe chmod 0644 'apparmor.d/libvirt/TEMPLATE.lxc' maybe chmod 0644 'apparmor.d/libvirt/TEMPLATE.qemu' -maybe chmod 0644 'apparmor.d/libvirt/libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a' -maybe chmod 0644 'apparmor.d/libvirt/libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a.files' maybe chmod 0644 'apparmor.d/lightdm-guest-session' maybe chmod 0755 'apparmor.d/local' maybe chmod 0644 'apparmor.d/local/README' diff --git a/apparmor.d/libvirt/libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a b/apparmor.d/libvirt/libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a deleted file mode 100644 index aa705be..0000000 --- a/apparmor.d/libvirt/libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a +++ /dev/null @@ -1,11 +0,0 @@ -# -# This profile is for the domain whose UUID matches this file. -# - -#include - -profile libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a flags=(attach_disconnected) { - #include - #include - -} diff --git a/apparmor.d/libvirt/libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a.files b/apparmor.d/libvirt/libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a.files deleted file mode 100644 index 569261f..0000000 --- a/apparmor.d/libvirt/libvirt-11907b27-d003-4cf9-aac0-27f3ff9a219a.files +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT EDIT THIS FILE DIRECTLY. IT IS MANAGED BY LIBVIRT. - "/var/log/libvirt/**/centos-stream9.log" w, - "/var/lib/libvirt/qemu/domain-centos-stream9/monitor.sock" rw, - "/var/lib/libvirt/qemu/domain-1-centos-stream9/*" rw, - "/run/libvirt/**/centos-stream9.pid" rwk, - "/run/libvirt/**/*.tunnelmigrate.dest.centos-stream9" rw, - "/var/lib/images/centos-stream9.qcow2" rwk, - "/dev/vhost-net" rw, - "/var/lib/libvirt/qemu/domain-1-centos-stream9/{,**}" rwk, - "/var/lib/libvirt/qemu/channel/target/domain-1-centos-stream9/{,**}" rwk, - "/var/lib/libvirt/qemu/domain-1-centos-stream9/master-key.aes" rwk, - "/dev/net/tun" rwk, diff --git a/cups/printers.conf b/cups/printers.conf index 4603246..a7e111a 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -33,7 +33,7 @@ Location Arbeitszimmer MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended) DeviceURI dnssd://HP%20Color%20LaserJet%20MFP%20M277dw%20(28CAA8)._ipp._tcp.local/?uuid=564e4238-4b34-3044-4a46-3c528228caa8 State Idle -StateTime 1649452023 +StateTime 1650464201 ConfigTime 1641601003 Reason wifi-not-configured-report Type 8425500 diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 1a8b748..0605ad3 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -33,7 +33,7 @@ Location Arbeitszimmer MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended) DeviceURI dnssd://HP%20Color%20LaserJet%20MFP%20M277dw%20(28CAA8)._ipp._tcp.local/?uuid=564e4238-4b34-3044-4a46-3c528228caa8 State Idle -StateTime 1649451675 +StateTime 1650464128 ConfigTime 1641601003 Reason wifi-not-configured-report Reason cups-waiting-for-job-completed diff --git a/resolv.conf b/resolv.conf index 9a0c1ae..c3eb8f0 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,5 +1,6 @@ -search pixelpark.net pixelpark.com pixelpark.de brehm-online.com uhu-banane.net pp-dns.com -nameserver 77.74.232.24 -nameserver 77.74.232.25 -nameserver 93.188.104.82 +search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de uhu-banane.net +nameserver 127.0.0.1 +nameserver 1.1.1.1 +nameserver 8.8.8.8 +nameserver 8.8.4.4 options timeout:1 attempts:2 use-vc -- 2.39.5