saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 465d80b5755a6643aa242ad85de39c06af7d1205..d0c016241a28f659d60a56d86b559efb600c7a24 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1973,6 +1973,10 @@ maybe chmod 0755 'libvirt/qemu/networks'
 maybe chmod 0755 'libvirt/qemu/networks/autostart'
 maybe chmod 0600 'libvirt/qemu/networks/default.xml'
 maybe chmod 0700 'libvirt/secrets'
+maybe chmod 0755 'libvirt/storage'
+maybe chmod 0755 'libvirt/storage/autostart'
+maybe chmod 0600 'libvirt/storage/default.xml'
+maybe chmod 0600 'libvirt/storage/images.xml'
 maybe chmod 0644 'libvirt/virt-login-shell.conf'
 maybe chmod 0644 'libvirt/virtlockd.conf'
 maybe chmod 0644 'libvirt/virtlogd.conf'

diff --git a/alternatives/ex b/alternatives/ex
index b021177f822c732f779147f120e079d1282e2fa5..1d112dac81210d7a950b7fae25d2a1f4372e86f5 120000 (symlink)
--- a/alternatives/ex
+++ b/alternatives/ex
@@ -1 +1 @@
-/usr/bin/vim.gtk3
\ No newline at end of file
+/usr/bin/vim.basic
\ No newline at end of file

diff --git a/alternatives/pbr b/alternatives/pbr
index a1a51d1b055ba8e7f6be78d216565fa328988fa4..0ac3fb33d96d5aee3b9bee053b7b16177cca8f3a 120000 (symlink)
--- a/alternatives/pbr
+++ b/alternatives/pbr
@@ -1 +1 @@
-/usr/bin/python2-pbr
\ No newline at end of file
+/usr/bin/python3-pbr
\ No newline at end of file

diff --git a/alternatives/rview b/alternatives/rview
index b021177f822c732f779147f120e079d1282e2fa5..1d112dac81210d7a950b7fae25d2a1f4372e86f5 120000 (symlink)
--- a/alternatives/rview
+++ b/alternatives/rview
@@ -1 +1 @@
-/usr/bin/vim.gtk3
\ No newline at end of file
+/usr/bin/vim.basic
\ No newline at end of file

diff --git a/alternatives/rvim b/alternatives/rvim
index b021177f822c732f779147f120e079d1282e2fa5..1d112dac81210d7a950b7fae25d2a1f4372e86f5 120000 (symlink)
--- a/alternatives/rvim
+++ b/alternatives/rvim
@@ -1 +1 @@
-/usr/bin/vim.gtk3
\ No newline at end of file
+/usr/bin/vim.basic
\ No newline at end of file

diff --git a/alternatives/vi b/alternatives/vi
index b021177f822c732f779147f120e079d1282e2fa5..1d112dac81210d7a950b7fae25d2a1f4372e86f5 120000 (symlink)
--- a/alternatives/vi
+++ b/alternatives/vi
@@ -1 +1 @@
-/usr/bin/vim.gtk3
\ No newline at end of file
+/usr/bin/vim.basic
\ No newline at end of file

diff --git a/alternatives/view b/alternatives/view
index b021177f822c732f779147f120e079d1282e2fa5..1d112dac81210d7a950b7fae25d2a1f4372e86f5 120000 (symlink)
--- a/alternatives/view
+++ b/alternatives/view
@@ -1 +1 @@
-/usr/bin/vim.gtk3
\ No newline at end of file
+/usr/bin/vim.basic
\ No newline at end of file

diff --git a/alternatives/vim b/alternatives/vim
index b021177f822c732f779147f120e079d1282e2fa5..1d112dac81210d7a950b7fae25d2a1f4372e86f5 120000 (symlink)
--- a/alternatives/vim
+++ b/alternatives/vim
@@ -1 +1 @@
-/usr/bin/vim.gtk3
\ No newline at end of file
+/usr/bin/vim.basic
\ No newline at end of file

diff --git a/alternatives/vimdiff b/alternatives/vimdiff
index b021177f822c732f779147f120e079d1282e2fa5..1d112dac81210d7a950b7fae25d2a1f4372e86f5 120000 (symlink)
--- a/alternatives/vimdiff
+++ b/alternatives/vimdiff
@@ -1 +1 @@
-/usr/bin/vim.gtk3
\ No newline at end of file
+/usr/bin/vim.basic
\ No newline at end of file

diff --git a/group b/group
index 7b14a90d336b7c7e69734ced58c2599f09637b5b..a952acc71288531192f5b194bb635770c5e39aab 100644 (file)
--- a/group
+++ b/group
@@ -3,23 +3,23 @@ daemon:x:1:
 bin:x:2:
 sys:x:3:
 adm:x:4:syslog,frank
-tty:x:5:
+tty:x:5:frank
 disk:x:6:
-lp:x:7:
+lp:x:7:frank
 mail:x:8:
 news:x:9:
 uucp:x:10:
 man:x:12:
 proxy:x:13:
 kmem:x:15:
-dialout:x:20:
-fax:x:21:
+dialout:x:20:frank
+fax:x:21:frank
 voice:x:22:
 cdrom:x:24:frank
-floppy:x:25:
-tape:x:26:
+floppy:x:25:frank
+tape:x:26:frank
 sudo:x:27:frank
-audio:x:29:pulse
+audio:x:29:pulse,frank
 dip:x:30:frank
 www-data:x:33:
 backup:x:34:
@@ -30,22 +30,22 @@ src:x:40:
 gnats:x:41:
 shadow:x:42:
 utmp:x:43:
-video:x:44:plex
+video:x:44:plex,frank
 sasl:x:45:
 plugdev:x:46:frank
 staff:x:50:
-games:x:60:
+games:x:60:frank
 users:x:100:
 nogroup:x:65534:
 systemd-journal:x:101:
 systemd-network:x:102:
 systemd-resolve:x:103:
 input:x:104:
-crontab:x:105:
+crontab:x:105:frank
 syslog:x:106:
 messagebus:x:107:
 netdev:x:108:
-mlocate:x:109:
+mlocate:x:109:frank
 ssl-cert:x:110:
 uuidd:x:111:
 lpadmin:x:112:frank
@@ -56,7 +56,7 @@ bluetooth:x:116:
 systemd-coredump:x:117:
 lightdm:x:119:
 nopasswdlogin:x:120:
-scanner:x:121:saned
+scanner:x:121:saned,frank
 saned:x:122:
 nm-openvpn:x:123:
 avahi:x:124:

diff --git a/group- b/group-
index c8f9b9b5ab85d5e542447d9474295cdf2199d377..7b14a90d336b7c7e69734ced58c2599f09637b5b 100644 (file)
--- a/group-
+++ b/group-
@@ -75,3 +75,4 @@ _chrony:x:135:
 gdm:x:118:
 libvirt:x:136:frank
 libvirt-qemu:x:64055:libvirt-qemu
+libvirt-dnsmasq:x:137:

diff --git a/gshadow b/gshadow
index 8f0268c1003685dd6860253899db84bda263aed4..4384bceefee747f3f1d241d2baad5cf380d181b9 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -3,23 +3,23 @@ daemon:*::
 bin:*::
 sys:*::
 adm:*::syslog,frank
-tty:*::
+tty:*::frank
 disk:*::
-lp:*::
+lp:*::frank
 mail:*::
 news:*::
 uucp:*::
 man:*::
 proxy:*::
 kmem:*::
-dialout:*::
-fax:*::
+dialout:*::frank
+fax:*::frank
 voice:*::
 cdrom:*::frank
-floppy:*::
-tape:*::
+floppy:*::frank
+tape:*::frank
 sudo:*::frank
-audio:*::pulse
+audio:*::pulse,frank
 dip:*::frank
 www-data:*::
 backup:*::
@@ -30,22 +30,22 @@ src:*::
 gnats:*::
 shadow:*::
 utmp:*::
-video:*::plex
+video:*::plex,frank
 sasl:*::
 plugdev:*::frank
 staff:*::
-games:*::
+games:*::frank
 users:*::
 nogroup:*::
 systemd-journal:!::
 systemd-network:!::
 systemd-resolve:!::
 input:!::
-crontab:!::
+crontab:!::frank
 syslog:!::
 messagebus:!::
 netdev:!::
-mlocate:!::
+mlocate:!::frank
 ssl-cert:!::
 uuidd:!::
 lpadmin:!::frank
@@ -56,7 +56,7 @@ bluetooth:!::
 systemd-coredump:!::
 lightdm:!::
 nopasswdlogin:!::
-scanner:!::saned
+scanner:!::saned,frank
 saned:!::
 nm-openvpn:!::
 avahi:!::

diff --git a/gshadow- b/gshadow-
index 4563eee48b4d2c195432f5f49e621a465630265d..8f0268c1003685dd6860253899db84bda263aed4 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -75,3 +75,4 @@ _chrony:!::
 gdm:!::
 libvirt:!::frank
 libvirt-qemu:!::libvirt-qemu
+libvirt-dnsmasq:!::

diff --git a/libvirt/storage/autostart/default.xml b/libvirt/storage/autostart/default.xml
new file mode 120000 (symlink)
index 0000000..c318388
--- /dev/null
+++ b/libvirt/storage/autostart/default.xml
@@ -0,0 +1 @@
+/etc/libvirt/storage/default.xml
\ No newline at end of file

diff --git a/libvirt/storage/autostart/images.xml b/libvirt/storage/autostart/images.xml
new file mode 120000 (symlink)
index 0000000..5feafd6
--- /dev/null
+++ b/libvirt/storage/autostart/images.xml
@@ -0,0 +1 @@
+/etc/libvirt/storage/images.xml
\ No newline at end of file

diff --git a/libvirt/storage/default.xml b/libvirt/storage/default.xml
new file mode 100644 (file)
index 0000000..be10072
--- /dev/null
+++ b/libvirt/storage/default.xml
@@ -0,0 +1,19 @@
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh pool-edit default
+or other application using the libvirt API.
+-->
+
+<pool type='dir'>
+  <name>default</name>
+  <uuid>9e5884d9-efcb-400b-a55d-ffefbbcb891f</uuid>
+  <capacity unit='bytes'>0</capacity>
+  <allocation unit='bytes'>0</allocation>
+  <available unit='bytes'>0</available>
+  <source>
+  </source>
+  <target>
+    <path>/var/lib/images</path>
+  </target>
+</pool>

diff --git a/libvirt/storage/images.xml b/libvirt/storage/images.xml
new file mode 100644 (file)
index 0000000..11ab1ec
--- /dev/null
+++ b/libvirt/storage/images.xml
@@ -0,0 +1,19 @@
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh pool-edit images
+or other application using the libvirt API.
+-->
+
+<pool type='dir'>
+  <name>images</name>
+  <uuid>a3dc3617-2c3d-4440-99ba-f6dc7f119ff3</uuid>
+  <capacity unit='bytes'>0</capacity>
+  <allocation unit='bytes'>0</allocation>
+  <available unit='bytes'>0</available>
+  <source>
+  </source>
+  <target>
+    <path>/var/lib/images</path>
+  </target>
+</pool>