daily autocommit

diff --git a/.etckeeper b/.etckeeper
index b325febd9b464e2cb89607361e4664f9f8762f3d..ad217717c16c7b72dca1ebf4a6af211b2181e011 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2353,6 +2353,7 @@ maybe chmod 0600 'libvirt/qemu.conf'
 maybe chmod 0755 'libvirt/qemu/networks'
 maybe chmod 0755 'libvirt/qemu/networks/autostart'
 maybe chmod 0600 'libvirt/qemu/networks/default.xml'
+maybe chmod 0600 'libvirt/qemu/win10.xml'
 maybe chmod 0700 'libvirt/secrets'
 maybe chmod 0755 'libvirt/storage'
 maybe chmod 0600 'libvirt/storage/1TB_HDD.xml'

diff --git a/apparmor.d/libvirt/libvirt-2a11cec6-cf27-414e-bb50-1fa264f07ff1.files b/apparmor.d/libvirt/libvirt-2a11cec6-cf27-414e-bb50-1fa264f07ff1.files
index a632b5ba5ef9676f922330ea874e461a5d3a9eca..aa5da798312ce3c6a0d90fe9fd8496261e3ddea4 100644 (file)
--- a/apparmor.d/libvirt/libvirt-2a11cec6-cf27-414e-bb50-1fa264f07ff1.files
+++ b/apparmor.d/libvirt/libvirt-2a11cec6-cf27-414e-bb50-1fa264f07ff1.files
@@ -1,10 +1,10 @@
 # DO NOT EDIT THIS FILE DIRECTLY. IT IS MANAGED BY LIBVIRT.
   "/var/log/libvirt/**/win10.log" w,
   "/var/lib/libvirt/qemu/domain-win10/monitor.sock" rw,
-  "/var/lib/libvirt/qemu/domain-2-win10/*" rw,
+  "/var/lib/libvirt/qemu/domain-3-win10/*" rw,
   "/run/libvirt/**/win10.pid" rwk,
   "/run/libvirt/**/*.tunnelmigrate.dest.win10" rw,
   "/media/mhoellein/1TB_HDD/win10_import.qcow2" rwk,
-  "/var/lib/libvirt/qemu/domain-2-win10/{,**}" rwk,
-  "/var/lib/libvirt/qemu/channel/target/domain-2-win10/{,**}" rwk,
-  "/var/lib/libvirt/qemu/domain-2-win10/master-key.aes" rwk,
+  "/var/lib/libvirt/qemu/domain-3-win10/{,**}" rwk,
+  "/var/lib/libvirt/qemu/channel/target/domain-3-win10/{,**}" rwk,
+  "/var/lib/libvirt/qemu/domain-3-win10/master-key.aes" rwk,

diff --git a/fstab b/fstab
index 67298913e005f6794fd2bb51b0c386f9d55c2659..3cb2bcbaa425997a0185796cbacb4c721e5d4e48 100644 (file)
--- a/fstab
+++ b/fstab
@@ -11,6 +11,6 @@ UUID=be873613-2511-4351-8793-dd95364a9151 /boot           ext2    defaults
 # /boot/efi was on /dev/sda1 during installation
 UUID=79B5-A8D6  /boot/efi       vfat    umask=0077      0       1
 /dev/mapper/ubuntu--vg-swap_1 none            swap    sw              0       0
-UUID=420872E20872D3FF  /windows        ntfs    uid=1011,umask=0022,ro  0       0
+# UUID=420872E20872D3FF        /windows        ntfs    uid=1011,umask=0022,ro  0       0
 https://webdav.mediencenter.t-online.de        /media/magenta_cloud   davfs   rw,noauto,user  0       0
 https://webdav.hidrive.strato.com /media/mhoellein/hidrive     davfs   noauto,user,rw 0 0

diff --git a/libvirt/qemu/win10.xml b/libvirt/qemu/win10.xml
new file mode 100644 (file)
index 0000000..068af73
--- /dev/null
+++ b/libvirt/qemu/win10.xml
@@ -0,0 +1,154 @@
+<!--
+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 edit win10
+or other application using the libvirt API.
+-->
+
+<domain type='kvm'>
+  <name>win10</name>
+  <uuid>865b0476-552c-48e0-8d91-a53104462e1e</uuid>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+      <libosinfo:os id="http://microsoft.com/win/10"/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-q35-4.2'>hvm</type>
+    <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.ms.fd</loader>
+    <nvram>/var/lib/libvirt/qemu/nvram/win10_VARS.fd</nvram>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <hyperv>
+      <relaxed state='on'/>
+      <vapic state='on'/>
+      <spinlocks state='on' retries='8191'/>
+    </hyperv>
+    <vmport state='off'/>
+  </features>
+  <cpu mode='host-model' check='partial'/>
+  <clock offset='localtime'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+    <timer name='hypervclock' present='yes'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/win10.qcow2'/>
+      <target dev='vda' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/win10-1.qcow2'/>
+      <target dev='vdb' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/var/lib/libvirt/images/virtio-win-0.1.171.iso'/>
+      <target dev='sdb' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pcie-root'/>
+    <controller type='pci' index='1' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='1' port='0x10'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='2' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='2' port='0x11'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
+    </controller>
+    <controller type='pci' index='3' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='3' port='0x12'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
+    </controller>
+    <controller type='pci' index='4' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='4' port='0x13'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
+    </controller>
+    <controller type='pci' index='5' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='5' port='0x14'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
+    </controller>
+    <controller type='pci' index='6' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='6' port='0x15'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
+    </controller>
+    <interface type='network'>
+      <mac address='52:54:00:10:c1:96'/>
+      <source network='default'/>
+      <model type='e1000e'/>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </interface>
+    <serial type='pty'>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
+    <input type='tablet' bus='usb'>
+      <address type='usb' bus='0' port='1'/>
+    </input>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='spice' autoport='yes'>
+      <listen type='address'/>
+      <image compression='off'/>
+    </graphics>
+    <sound model='ich9'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
+    </sound>
+    <video>
+      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
+    </video>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='2'/>
+    </redirdev>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='3'/>
+    </redirdev>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>

diff --git a/lvm/backup/ubuntu-vg b/lvm/backup/ubuntu-vg
index c8a8aa36e1d9d073239837a2be90415969f6a9ee..08c4fbc73ce026a3f13cc16406ab4357733d387b 100644 (file)
--- a/lvm/backup/ubuntu-vg
+++ b/lvm/backup/ubuntu-vg
@@ -1,16 +1,16 @@
-# Generated by LVM2 version 2.03.07(2) (2019-11-30): Tue May 26 05:59:25 2020
+# Generated by LVM2 version 2.03.07(2) (2019-11-30): Sun Jul 12 23:32:36 2020
 
 contents = "Text Format Volume Group"
 version = 1
 
-description = "Created *after* executing 'vgcfgbackup'"
+description = "Created *after* executing 'vgextend ubuntu-vg /dev/mapper/sdb1_crypt'"
 
-creation_host = "zenbook"      # Linux zenbook 5.3.0-53-generic #47-Ubuntu SMP Thu May 7 12:18:16 UTC 2020 x86_64
-creation_time = 1590465565     # Tue May 26 05:59:25 2020
+creation_host = "zenbook"      # Linux zenbook 5.4.0-33-generic #37-Ubuntu SMP Thu May 21 12:53:59 UTC 2020 x86_64
+creation_time = 1594589556     # Sun Jul 12 23:32:36 2020
 
 ubuntu-vg {
        id = "iGNPYk-QMOA-fa9p-L6CG-71WP-vdqm-C1xbGg"
-       seqno = 4
+       seqno = 7
        format = "lvm2"                 # informational
        status = ["RESIZEABLE", "READ", "WRITE"]
        flags = []
@@ -31,6 +31,17 @@ ubuntu-vg {
                        pe_start = 2048
                        pe_count = 228677       # 893,27 Gigabytes
                }
+
+               pv1 {
+                       id = "luxzNO-O50i-01Tx-yy4X-xDiE-2Hd7-5oQXSs"
+                       device = "/dev/mapper/sdb1_crypt"       # Hint only
+
+                       status = ["ALLOCATABLE"]
+                       flags = []
+                       dev_size = 500083376    # 238,458 Gigabytes
+                       pe_start = 2048
+                       pe_count = 61045        # 238,457 Gigabytes
+               }
        }
 
        logical_volumes {