committing changes in /etc made by "/usr/bin/apt full-upgrade -y"

Package changes:
-alsa-ucm-conf 1.2.2-1ubuntu0.11 all
+alsa-ucm-conf 1.2.2-1ubuntu0.12 all
-fwupd 1.5.11-0ubuntu1~20.04.2 amd64
-fwupd-signed 1.27.1ubuntu5+1.5.11-0ubuntu1~20.04.2 amd64
+fwupd 1.7.5-3~20.04.1 amd64
+fwupd-signed 1.27.1ubuntu7+1.2-2~20.04.1 amd64
-libfwupd2 1.5.11-0ubuntu1~20.04.2 amd64
+libfwupd2 1.7.5-3~20.04.1 amd64
+libfwupdplugin5 1.7.5-3~20.04.1 amd64
-libjcat1 0.1.3-2~ubuntu20.04.1 amd64
+libjcat1 0.1.4-0ubuntu0.20.04.1 amd64

diff --git a/.etckeeper b/.etckeeper
index d064aef1cc2f9d3aca5b013416b961682a92564b..9ec1ba6a1b9c874f5b73855e9762a3b70ee2096b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1714,6 +1714,7 @@ maybe chmod 0755 'grub.d/10_linux_zfs'
 maybe chmod 0755 'grub.d/20_linux_xen'
 maybe chmod 0755 'grub.d/30_os-prober'
 maybe chmod 0755 'grub.d/30_uefi-firmware'
+maybe chmod 0755 'grub.d/35_fwupd'
 maybe chmod 0755 'grub.d/40_custom'
 maybe chmod 0755 'grub.d/41_custom'
 maybe chmod 0644 'grub.d/README'

diff --git a/fwupd/daemon.conf b/fwupd/daemon.conf
index 49e3797f0598f67f5432f03c84e548a9cfcf4032..851047ff7ab3d1a7dc68beba88f12f9b3a8b8878 100644 (file)
--- a/fwupd/daemon.conf
+++ b/fwupd/daemon.conf
@@ -42,3 +42,23 @@ BlockedFirmware=
 #
 # If unset or no schemes are listed, the default will be: file,https,http,ipfs
 UriSchemes=
+
+# Ignore power levels of devices when running updates
+IgnorePower=false
+
+# Only support installing firmware signed with a trusted key
+OnlyTrusted=true
+
+# A host best known configuration is used when using `fwupdmgr sync` which can
+# downgrade firmware to factory versions or upgrade firmware to a supported
+# config level. e.g. `vendor-factory-2021q1`
+HostBkc=
+
+# these are only required when the SMBIOS or Device Tree data is invalid or missing
+#Manufacturer=
+#ProductName=
+#ProductSku=
+#Family=
+#EnclosureKind=
+#BaseboardProduct=
+#BaseboardManufacturer=

diff --git a/fwupd/redfish.conf b/fwupd/redfish.conf
index ee879e3bd2b8bca7ae26c58688a6ab00f91a13fe..6675d59649b473ce35f409a9c6e73e7c9bcde398 100644 (file)
--- a/fwupd/redfish.conf
+++ b/fwupd/redfish.conf
@@ -10,5 +10,8 @@
 
 # Whether to verify the server certificate or not
 # Expected value: TRUE or FALSE
-# Default: TRUE
+# Default: FALSE
 #CACheck=
+
+# Do not use IPMI KCS to create an initial user account if no SMBIOS data
+IpmiDisableCreateUser=False

diff --git a/fwupd/remotes.d/lvfs-testing.conf b/fwupd/remotes.d/lvfs-testing.conf
index 740a793e8f059b7612e0b65c50e492a2db9fed0c..42575498f44c44d9240430868889d113de9697cb 100644 (file)
--- a/fwupd/remotes.d/lvfs-testing.conf
+++ b/fwupd/remotes.d/lvfs-testing.conf
@@ -5,8 +5,8 @@ Enabled=false
 Title=Linux Vendor Firmware Service (testing)
 MetadataURI=https://cdn.fwupd.org/downloads/firmware-testing.xml.gz
 ReportURI=https://fwupd.org/lvfs/firmware/report
-Username=
-Password=
+#Username=
+#Password=
 OrderBefore=lvfs,fwupd
 AutomaticReports=false
 ApprovalRequired=false

diff --git a/fwupd/uefi_capsule.conf b/fwupd/uefi_capsule.conf
index c543a7f2494c9866726c14d760c0aa38a68c838c..1fc5ef4d28efeae7857c1acbebca4ee7e325c4f9 100644 (file)
--- a/fwupd/uefi_capsule.conf
+++ b/fwupd/uefi_capsule.conf
@@ -1,11 +1,14 @@
 [uefi_capsule]
 
+# use GRUB to launch fwupdx64.efi
+#EnableGrubChainLoad=false
+
 # the shim loader is required to chainload the fwupd EFI binary unless
 # the fwupd.efi file has been self-signed manually
 #DisableShimForSecureBoot=true
 
-# the EFI system partition path used
-# if this is is not /boot/efi, /boot, or /efi
+# the EFI system partition (ESP) path used if UDisks is not available
+# or if this partition is not mounted at /boot/efi, /boot, or /efi
 #OverrideESPMountPoint=
 
 # amount of free space required on the ESP, for example using 0x2000000 for 32Mb
@@ -14,3 +17,6 @@
 # with the UEFI removable path enabled, the default esp path is set to /EFI/boot
 # the shim EFI binary and presumably this is $ESP/EFI/boot/bootx64.efi
 #FallbacktoRemovablePath=false
+
+# allow ignoring the CapsuleOnDisk support advertised by the firmware
+#DisableCapsuleUpdateOnDisk=true

diff --git a/grub.d/35_fwupd b/grub.d/35_fwupd
new file mode 100755 (executable)
index 0000000..496cd66
--- /dev/null
+++ b/grub.d/35_fwupd
@@ -0,0 +1,24 @@
+#! /bin/sh
+# SPDX-License-Identifier: LGPL-2.1+
+set -e
+
+[ -d ${pkgdatadir:?} ]
+# shellcheck source=/dev/null
+. "$pkgdatadir/grub-mkconfig_lib"
+
+if [ -f /var/lib/fwupd/uefi_capsule.conf ] &&
+   ls /sys/firmware/efi/efivars/fwupd-*-0abba7dc-e516-4167-bbf5-4d9d1c739416 1>/dev/null 2>&1; then
+      . /var/lib/fwupd/uefi_capsule.conf
+      if [ "${EFI_PATH}" != "" ] && [ "${ESP}" != "" ]; then
+      echo "Adding Linux Firmware Updater entry" >&2
+cat << EOF
+menuentry 'Linux Firmware Updater' \$menuentry_id_option 'fwupd' {
+EOF
+      ${grub_probe:?}
+      prepare_grub_to_access_device '`${grub_probe} --target=device \${ESP}` | sed -e "s/^/\t/"'
+cat << EOF
+       chainloader ${EFI_PATH}
+}
+EOF
+      fi
+fi

diff --git a/update-motd.d/85-fwupd b/update-motd.d/85-fwupd
index 562f1e82043731e9533bd1a25f1ff9b828983bfe..261f9a37bca57d3217681a42025bcfd0a38d1296 100755 (executable)
--- a/update-motd.d/85-fwupd
+++ b/update-motd.d/85-fwupd
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-if [ -f /run/motd.d/fwupd/85-fwupd ]; then
-        cat /run/motd.d/fwupd/85-fwupd
+if [ -f /run/motd.d/85-fwupd ]; then
+        cat /run/motd.d/85-fwupd
 fi