committing changes in /etc after apt run

Package changes:
-dmidecode 3.1-1 amd64
+dmidecode 3.1-1ubuntu0.1 amd64
-fwupd 1.0.9-0ubuntu2 amd64
-fwupdate 12-3bionic2 amd64
-fwupdate-signed 1.19bionic2+12-3bionic2 amd64
+fwupd 1.2.10-1ubuntu2~ubuntu18.04.3 amd64
+fwupd-signed 1.10~ubuntu18.04.3+1.2.10-1ubuntu2~ubuntu18.04.3 amd64
+fwupdate 12-7~ubuntu18.04.3 amd64
+fwupdate-signed 12-7~ubuntu18.04.3 amd64
-libfwupd2 1.0.9-0ubuntu2 amd64
+libfwupd2 1.2.10-1ubuntu2~ubuntu18.04.3 amd64
-libnss-myhostname 237-3ubuntu10.38 amd64
-libnss-systemd 237-3ubuntu10.38 amd64
+libnss-myhostname 237-3ubuntu10.39 amd64
+libnss-systemd 237-3ubuntu10.39 amd64
-libpam-systemd 237-3ubuntu10.38 amd64
+libpam-systemd 237-3ubuntu10.39 amd64
-libsystemd0 237-3ubuntu10.38 amd64
+libsystemd0 237-3ubuntu10.39 amd64
-libudev1 237-3ubuntu10.38 amd64
-libudev1 237-3ubuntu10.38 i386
+libudev1 237-3ubuntu10.39 amd64
+libudev1 237-3ubuntu10.39 i386
+libxmlb1 0.1.8-1~ubuntu18.04.1 amd64
-linux-generic 4.15.0.76.78 amd64
-linux-generic-hwe-18.04 5.3.0.28.96 amd64
+linux-generic 4.15.0.88.80 amd64
+linux-generic-hwe-18.04 5.3.0.40.97 amd64
+linux-headers-4.15.0-88 4.15.0-88.88 all
+linux-headers-4.15.0-88-generic 4.15.0-88.88 amd64
-linux-headers-generic 4.15.0.76.78 amd64
-linux-headers-generic-hwe-18.04 5.3.0.28.96 amd64
+linux-headers-5.3.0-40 5.3.0-40.32~18.04.1 all
+linux-headers-5.3.0-40-generic 5.3.0-40.32~18.04.1 amd64
+linux-headers-generic 4.15.0.88.80 amd64
+linux-headers-generic-hwe-18.04 5.3.0.40.97 amd64
+linux-image-4.15.0-88-generic 4.15.0-88.88 amd64
-linux-image-generic 4.15.0.76.78 amd64
-linux-image-generic-hwe-18.04 5.3.0.28.96 amd64
+linux-image-5.3.0-40-generic 5.3.0-40.32~18.04.1 amd64
+linux-image-generic 4.15.0.88.80 amd64
+linux-image-generic-hwe-18.04 5.3.0.40.97 amd64
-linux-libc-dev 4.15.0-76.86 amd64
+linux-libc-dev 4.15.0-88.88 amd64
+linux-modules-4.15.0-88-generic 4.15.0-88.88 amd64
+linux-modules-5.3.0-40-generic 5.3.0-40.32~18.04.1 amd64
+linux-modules-extra-4.15.0-88-generic 4.15.0-88.88 amd64
+linux-modules-extra-5.3.0-40-generic 5.3.0-40.32~18.04.1 amd64
-systemd 237-3ubuntu10.38 amd64
-systemd-sysv 237-3ubuntu10.38 amd64
+systemd 237-3ubuntu10.39 amd64
+systemd-sysv 237-3ubuntu10.39 amd64
-udev 237-3ubuntu10.38 amd64
+udev 237-3ubuntu10.39 amd64
-xserver-common 2:1.19.6-1ubuntu4.3 all
-xserver-xephyr 2:1.19.6-1ubuntu4.3 amd64
+xserver-common 2:1.19.6-1ubuntu4.4 all
+xserver-xephyr 2:1.19.6-1ubuntu4.4 amd64
-xserver-xorg-core 2:1.19.6-1ubuntu4.3 amd64
+xserver-xorg-core 2:1.19.6-1ubuntu4.4 amd64
-xserver-xorg-legacy 2:1.19.6-1ubuntu4.3 amd64
+xserver-xorg-legacy 2:1.19.6-1ubuntu4.4 amd64
-xwayland 2:1.19.6-1ubuntu4.3 amd64
+xwayland 2:1.19.6-1ubuntu4.4 amd64

diff --git a/.etckeeper b/.etckeeper
index e1127df5340f584cc526f1ce33c845e265cd16e6..d979ee32c580c338e48a29ff5c440a67bf16f277 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1523,10 +1523,13 @@ maybe chmod 0644 'fstab'
 maybe chmod 0644 'fuse.conf'
 maybe chmod 0755 'fwupd'
 maybe chmod 0644 'fwupd/daemon.conf'
+maybe chmod 0644 'fwupd/redfish.conf'
 maybe chmod 0755 'fwupd/remotes.d'
+maybe chmod 0644 'fwupd/remotes.d/dell-esrt.conf'
 maybe chmod 0644 'fwupd/remotes.d/fwupd.conf'
 maybe chmod 0644 'fwupd/remotes.d/lvfs-testing.conf'
 maybe chmod 0644 'fwupd/remotes.d/lvfs.conf'
+maybe chmod 0644 'fwupd/remotes.d/vendor-directory.conf'
 maybe chmod 0644 'fwupd/remotes.d/vendor.conf'
 maybe chmod 0644 'fwupd/uefi.conf'
 maybe chmod 0644 'g15daemon.conf'

diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index eeb62d4d20ab9c2b2226f1c1e2299abe37944740..c189bdc8a274eb5cfe463450c2ffe6b28e7b68bd 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,75 +1,75 @@
 // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
 APT::NeverAutoRemove
 {
-   "^linux-image-5\.3\.0-26-generic$";
    "^linux-image-5\.3\.0-28-generic$";
-   "^linux-headers-5\.3\.0-26-generic$";
+   "^linux-image-5\.3\.0-40-generic$";
    "^linux-headers-5\.3\.0-28-generic$";
-   "^linux-image-extra-5\.3\.0-26-generic$";
+   "^linux-headers-5\.3\.0-40-generic$";
    "^linux-image-extra-5\.3\.0-28-generic$";
-   "^linux-modules-5\.3\.0-26-generic$";
+   "^linux-image-extra-5\.3\.0-40-generic$";
    "^linux-modules-5\.3\.0-28-generic$";
-   "^linux-modules-extra-5\.3\.0-26-generic$";
+   "^linux-modules-5\.3\.0-40-generic$";
    "^linux-modules-extra-5\.3\.0-28-generic$";
-   "^linux-signed-image-5\.3\.0-26-generic$";
+   "^linux-modules-extra-5\.3\.0-40-generic$";
    "^linux-signed-image-5\.3\.0-28-generic$";
-   "^linux-image-unsigned-5\.3\.0-26-generic$";
+   "^linux-signed-image-5\.3\.0-40-generic$";
    "^linux-image-unsigned-5\.3\.0-28-generic$";
-   "^kfreebsd-image-5\.3\.0-26-generic$";
+   "^linux-image-unsigned-5\.3\.0-40-generic$";
    "^kfreebsd-image-5\.3\.0-28-generic$";
-   "^kfreebsd-headers-5\.3\.0-26-generic$";
+   "^kfreebsd-image-5\.3\.0-40-generic$";
    "^kfreebsd-headers-5\.3\.0-28-generic$";
-   "^gnumach-image-5\.3\.0-26-generic$";
+   "^kfreebsd-headers-5\.3\.0-40-generic$";
    "^gnumach-image-5\.3\.0-28-generic$";
-   "^.*-modules-5\.3\.0-26-generic$";
+   "^gnumach-image-5\.3\.0-40-generic$";
    "^.*-modules-5\.3\.0-28-generic$";
-   "^.*-kernel-5\.3\.0-26-generic$";
+   "^.*-modules-5\.3\.0-40-generic$";
    "^.*-kernel-5\.3\.0-28-generic$";
-   "^linux-backports-modules-.*-5\.3\.0-26-generic$";
+   "^.*-kernel-5\.3\.0-40-generic$";
    "^linux-backports-modules-.*-5\.3\.0-28-generic$";
-   "^linux-modules-.*-5\.3\.0-26-generic$";
+   "^linux-backports-modules-.*-5\.3\.0-40-generic$";
    "^linux-modules-.*-5\.3\.0-28-generic$";
-   "^linux-tools-5\.3\.0-26-generic$";
+   "^linux-modules-.*-5\.3\.0-40-generic$";
    "^linux-tools-5\.3\.0-28-generic$";
-   "^linux-cloud-tools-5\.3\.0-26-generic$";
+   "^linux-tools-5\.3\.0-40-generic$";
    "^linux-cloud-tools-5\.3\.0-28-generic$";
-   "^linux-buildinfo-5\.3\.0-26-generic$";
+   "^linux-cloud-tools-5\.3\.0-40-generic$";
    "^linux-buildinfo-5\.3\.0-28-generic$";
-   "^linux-source-5\.3\.0-26-generic$";
+   "^linux-buildinfo-5\.3\.0-40-generic$";
    "^linux-source-5\.3\.0-28-generic$";
+   "^linux-source-5\.3\.0-40-generic$";
 };
 /* Debug information:
 # dpkg list:
-ii  linux-image-4.15.0-74-generic              4.15.0-74.84                                    amd64        Signed kernel image generic
-ii  linux-image-4.15.0-76-generic              4.15.0-76.86                                    amd64        Signed kernel image generic
-ii  linux-image-5.0.0-32-generic               5.0.0-32.34~18.04.2                             amd64        Signed kernel image generic
-ii  linux-image-5.0.0-37-generic               5.0.0-37.40~18.04.1                             amd64        Signed kernel image generic
-ii  linux-image-5.3.0-26-generic               5.3.0-26.28~18.04.1                             amd64        Signed kernel image generic
-iF  linux-image-5.3.0-28-generic               5.3.0-28.30~18.04.1                             amd64        Signed kernel image generic
-ii  linux-image-generic                        4.15.0.76.78                                    amd64        Generic Linux kernel image
-ii  linux-image-generic-hwe-18.04              5.3.0.28.96                                     amd64        Generic Linux kernel image
+ii  linux-image-4.15.0-76-generic              4.15.0-76.86                                     amd64        Signed kernel image generic
+ii  linux-image-4.15.0-88-generic              4.15.0-88.88                                     amd64        Signed kernel image generic
+ii  linux-image-5.0.0-32-generic               5.0.0-32.34~18.04.2                              amd64        Signed kernel image generic
+ii  linux-image-5.3.0-26-generic               5.3.0-26.28~18.04.1                              amd64        Signed kernel image generic
+ii  linux-image-5.3.0-28-generic               5.3.0-28.30~18.04.1                              amd64        Signed kernel image generic
+iF  linux-image-5.3.0-40-generic               5.3.0-40.32~18.04.1                              amd64        Signed kernel image generic
+ii  linux-image-generic                        4.15.0.88.80                                     amd64        Generic Linux kernel image
+ii  linux-image-generic-hwe-18.04              5.3.0.40.97                                      amd64        Generic Linux kernel image
 # list of installed kernel packages:
-4.15.0-74-generic 4.15.0-74.84
 4.15.0-76-generic 4.15.0-76.86
+4.15.0-88-generic 4.15.0-88.88
 5.0.0-32-generic 5.0.0-32.34~18.04.2
-5.0.0-37-generic 5.0.0-37.40~18.04.1
 5.3.0-26-generic 5.3.0-26.28~18.04.1
 5.3.0-28-generic 5.3.0-28.30~18.04.1
+5.3.0-40-generic 5.3.0-40.32~18.04.1
 # list of different kernel versions:
+5.3.0-40.32~18.04.1
 5.3.0-28.30~18.04.1
 5.3.0-26.28~18.04.1
-5.0.0-37.40~18.04.1
 5.0.0-32.34~18.04.2
+4.15.0-88.88
 4.15.0-76.86
-4.15.0-74.84
-# Installing kernel: 5.3.0-28.30~18.04.1 (5.3.0-28-generic)
-# Running kernel: 5.3.0-26.28~18.04.1 (5.3.0-26-generic)
-# Last kernel: 5.3.0-28.30~18.04.1
-# Previous kernel: 5.3.0-26.28~18.04.1
+# Installing kernel: 5.3.0-40.32~18.04.1 (5.3.0-40-generic)
+# Running kernel: 5.3.0-28.30~18.04.1 (5.3.0-28-generic)
+# Last kernel: 5.3.0-40.32~18.04.1
+# Previous kernel: 5.3.0-28.30~18.04.1
 # Kernel versions list to keep:
-5.3.0-26.28~18.04.1
 5.3.0-28.30~18.04.1
+5.3.0-40.32~18.04.1
 # Kernel packages (version part) to protect:
-5\.3\.0-26-generic
 5\.3\.0-28-generic
+5\.3\.0-40-generic
 */

diff --git a/fwupd/daemon.conf b/fwupd/daemon.conf
index 51ab19f4c356e16089b89969e9c27b4c20fe6416..881c1458c9f416f0582ec5868ffd6661da46065d 100644 (file)
--- a/fwupd/daemon.conf
+++ b/fwupd/daemon.conf
@@ -10,3 +10,15 @@ BlacklistPlugins=test
 
 # Maximum archive size that can be loaded in Mb, with 0 for the default
 ArchiveSizeMax=0
+
+# Idle time in seconds to shut down the daemon -- note some plugins might
+# inhibit the auto-shutdown, for instance thunderbolt.
+#
+# A value of 0 specifies 'never'
+IdleTimeout=7200
+
+# Comma separated list of domains to log in verbose mode
+# If unset, no domains
+# If set to FuValue, FuValue domain (same as --domain-verbose=FuValue)
+# If set to *, all domains (same as --verbose)
+VerboseDomains=

diff --git a/fwupd/redfish.conf b/fwupd/redfish.conf
new file mode 100644 (file)
index 0000000..ee879e3
--- /dev/null
+++ b/fwupd/redfish.conf
@@ -0,0 +1,14 @@
+[redfish]
+
+# The URI to the Redfish service in the format <scheme>://<ip>:<port>
+# ex: https://192.168.0.133:443
+#Uri=
+
+# The username and password to the Redfish service
+#Username=
+#Password=
+
+# Whether to verify the server certificate or not
+# Expected value: TRUE or FALSE
+# Default: TRUE
+#CACheck=

diff --git a/fwupd/remotes.d/dell-esrt.conf b/fwupd/remotes.d/dell-esrt.conf
new file mode 100644 (file)
index 0000000..7313eee
--- /dev/null
+++ b/fwupd/remotes.d/dell-esrt.conf
@@ -0,0 +1,8 @@
+[fwupd Remote]
+
+# this remote provides metadata shipped with the fwupd package
+Enabled=true
+Title=Enable UEFI capsule updates on Dell systems
+Keyring=none
+MetadataURI=file:///usr/share/fwupd/remotes.d/dell-esrt/metadata.xml
+ApprovalRequired=false

diff --git a/fwupd/remotes.d/lvfs-testing.conf b/fwupd/remotes.d/lvfs-testing.conf
index 41d9ffff88e0439084b2fd528e82c184b8d8f537..fb60efdfea3a7a752d327f8f7c9f09b380ebea01 100644 (file)
--- a/fwupd/remotes.d/lvfs-testing.conf
+++ b/fwupd/remotes.d/lvfs-testing.conf
@@ -9,3 +9,4 @@ ReportURI=https://fwupd.org/lvfs/firmware/report
 Username=
 Password=
 OrderBefore=lvfs,fwupd
+ApprovalRequired=false

diff --git a/fwupd/remotes.d/lvfs.conf b/fwupd/remotes.d/lvfs.conf
index 4e971be675e16ab7b46a5f8695aa6b7f4e313a77..a08562f571bc6cebf26fba852eee760a3b0c11e4 100644 (file)
--- a/fwupd/remotes.d/lvfs.conf
+++ b/fwupd/remotes.d/lvfs.conf
@@ -7,3 +7,4 @@ Keyring=gpg
 MetadataURI=https://cdn.fwupd.org/downloads/firmware.xml.gz
 ReportURI=https://fwupd.org/lvfs/firmware/report
 OrderBefore=fwupd
+ApprovalRequired=false

diff --git a/fwupd/remotes.d/vendor-directory.conf b/fwupd/remotes.d/vendor-directory.conf
new file mode 100644 (file)
index 0000000..fd8886b
--- /dev/null
+++ b/fwupd/remotes.d/vendor-directory.conf
@@ -0,0 +1,8 @@
+[fwupd Remote]
+# this remote provides dynamically generated metadata shipped by the OS vendor and can
+# be found in /usr/share/fwupd/remotes.d/vendor/firmware
+Enabled=false
+Title=Vendor (Automatic)
+Keyring=none
+MetadataURI=file:///usr/share/fwupd/remotes.d/vendor/firmware
+ApprovalRequired=false

diff --git a/fwupd/remotes.d/vendor.conf b/fwupd/remotes.d/vendor.conf
index abd32ac7ffe940382b36fe5065ca3be368b15bd8..b2cf0d3052dae8819911f790c8fe778048786b0b 100644 (file)
--- a/fwupd/remotes.d/vendor.conf
+++ b/fwupd/remotes.d/vendor.conf
@@ -1,8 +1,8 @@
 [fwupd Remote]
-
 # this remote provides metadata shipped by the OS vendor and can be found in
-# /usr/share/fwupd/remotes.d/vendor and /usr/share/fwupd/remotes.d/vendor/firmware
+# /usr/share/fwupd/remotes.d/vendor and firmware in /usr/share/fwupd/remotes.d/vendor/firmware
 Enabled=false
 Title=Vendor
 Keyring=none
 MetadataURI=file:///usr/share/fwupd/remotes.d/vendor/vendor.xml.gz
+ApprovalRequired=false

diff --git a/fwupd/uefi.conf b/fwupd/uefi.conf
index 7ed75f6d401d9151095282d4ccfcfb6b136d4ede..fd7d384816238c7607b06f51ae4e165aa23e9e45 100644 (file)
--- a/fwupd/uefi.conf
+++ b/fwupd/uefi.conf
@@ -1,5 +1,12 @@
 [uefi]
 
-# For fwupdate 10+ allow overriding
-# the compiled EFI system partition path
-#OverrideESPMountPoint=/boot/efi
+# the shim loader is required to chainload the fwupd EFI binary unless
+# the fwupd.efi file has been self-signed manually
+RequireShimForSecureBoot=true
+
+# the EFI system partition path used
+# if this is is not /boot/efi, /boot, or /efi
+#OverrideESPMountPoint=
+
+# amount of free space required on the ESP, for example using 0x2000000 for 32Mb
+#RequireESPFreeSpace=