saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 13bee7d6191afef6aa51d2785e6bde911bb78226..b14ba911844956601e050a45b0189b43fbb2f695 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1854,18 +1854,13 @@ maybe chmod 0644 'fuse.conf'
 maybe chmod 0755 'fwupd'
 maybe chmod 0755 'fwupd/bios-settings.d'
 maybe chmod 0644 'fwupd/bios-settings.d/README.md'
-maybe chmod 0644 'fwupd/daemon.conf'
-maybe chmod 0644 'fwupd/fwupd.conf'
-maybe chmod 0644 'fwupd/msr.conf'
-maybe chmod 0644 'fwupd/redfish.conf'
+maybe chmod 0640 'fwupd/fwupd.conf'
 maybe chmod 0755 'fwupd/remotes.d'
 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/thunderbolt.conf'
-maybe chmod 0644 'fwupd/uefi_capsule.conf'
 maybe chmod 0644 'g15daemon.conf'
 maybe chmod 0755 'gadmin-samba'
 maybe chmod 0600 'gadmin-samba/gadmin_samba_users'

diff --git a/fwupd/daemon.conf b/fwupd/daemon.conf
deleted file mode 100644 (file)
index 851047f..0000000
--- a/fwupd/daemon.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-[fwupd]
-
-# Allow blocking specific devices by their GUID
-# Uses semicolons as delimiter
-DisabledDevices=
-
-# Allow blocking specific plugins
-# Uses semicolons as delimiter
-DisabledPlugins=test;test_ble;invalid
-
-# 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=
-
-# Update the message of the day (MOTD) on device and metadata changes
-UpdateMotd=true
-
-# For some plugins, enumerate only devices supported by metadata
-EnumerateAllDevices=false
-
-# A list of firmware checksums that has been approved by the site admin
-# If unset, all firmware is approved
-ApprovedFirmware=
-
-# Allow blocking specific devices by their checksum, either SHA1 or SHA256
-# Uses semicolons as delimiter
-BlockedFirmware=
-
-# Allowed URI schemes in the preference order; failed downloads from the first
-# scheme will be retried with the next in order until no choices remain.
-#
-# 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/fwupd.conf b/fwupd/fwupd.conf
index 7b51467123bac06886b6c1c64a181d94fedb00a7..63850c2021250ab04bca57132bde9263bc5b5aa3 100644 (file)
--- a/fwupd/fwupd.conf
+++ b/fwupd/fwupd.conf
@@ -1,2 +1,35 @@
-[fwupd]
-# use `man 5 fwupd.conf` for documentation
+[msr]
+#
+# Minimum kernel version to allow probing for sme flag
+MinimumSmeKernelVersion=5.18.0
+
+[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: FALSE
+#CACheck=
+#
+# Do not use IPMI KCS to create an initial user account if no SMBIOS data
+IpmiDisableCreateUser=False
+#
+# Amount of time in seconds to wait for a BMC restart
+ManagerResetTimeout=1800
+
+[thunderbolt]
+#
+# Minimum kernel version to allow use of this plugin
+# It's important that all backports from this kernel have been
+# made if using an older kernel
+MinimumKernelVersion=4.13.0
+#
+# Forces delaying activation until shutdown/logout/reboot
+DelayedActivation=false

diff --git a/fwupd/msr.conf b/fwupd/msr.conf
deleted file mode 100644 (file)
index 30a7ef5..0000000
--- a/fwupd/msr.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[msr]
-
-# Minimum kernel version to allow probing for sme flag
-MinimumSmeKernelVersion=5.18.0
-

diff --git a/fwupd/redfish.conf b/fwupd/redfish.conf
deleted file mode 100644 (file)
index d47bdf0..0000000
--- a/fwupd/redfish.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-[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: FALSE
-#CACheck=
-
-# Do not use IPMI KCS to create an initial user account if no SMBIOS data
-IpmiDisableCreateUser=False
-
-# Amount of time in seconds to wait for a BMC restart
-ManagerResetTimeout=1800

diff --git a/fwupd/thunderbolt.conf b/fwupd/thunderbolt.conf
deleted file mode 100644 (file)
index d6a61d1..0000000
--- a/fwupd/thunderbolt.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[thunderbolt]
-
-# Minimum kernel version to allow use of this plugin
-# It's important that all backports from this kernel have been
-# made if using an older kernel
-MinimumKernelVersion=4.13.0
-
-# Forces delaying activation until shutdown/logout/reboot
-DelayedActivation=false

diff --git a/fwupd/uefi_capsule.conf b/fwupd/uefi_capsule.conf
deleted file mode 100644 (file)
index 1fc5ef4..0000000
--- a/fwupd/uefi_capsule.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-[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 (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
-#RequireESPFreeSpace=
-
-# 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