spec: package /etc/dnf/usr_drift_protected_paths.d

evan-goode · kontura · commit d63e9f00eb0b · 2025-06-18T09:06:58.000+02:00
diff --git a/dnf.spec b/dnf.spec
@@ -318,6 +318,7 @@ fi
 %dir %{pluginconfpath}
 %if %{without dnf5_obsoletes_dnf}
 %dir %{confdir}/protected.d
+%dir %{confdir}/usr-drift-protected-paths.d
 %dir %{confdir}/vars
 %endif
 %dir %{confdir}/aliases.d
diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
@@ -262,7 +262,7 @@ def do_transaction(self, display=()):
                         logger.info(nevra)
                         for protected_path in protected_paths:
                             logger.info("  %s" % protected_path)
-                    raise CliError(_("Operation aborted."))
+                    raise CliError(_("Operation aborted. Pass --setopt=usr_drift_protected_paths= to disable this check and proceed anyway."))
 
             else:
                 # Not a bootc transaction.
diff --git a/etc/dnf/CMakeLists.txt b/etc/dnf/CMakeLists.txt
@@ -1,3 +1,4 @@
 INSTALL (FILES "dnf-strict.conf" "dnf.conf" "automatic.conf" DESTINATION ${SYSCONFDIR}/dnf)
 ADD_SUBDIRECTORY (aliases.d)
 ADD_SUBDIRECTORY (protected.d)
+ADD_SUBDIRECTORY (usr-drift-protected-paths.d)
diff --git a/etc/dnf/usr-drift-protected-paths.d/CMakeLists.txt b/etc/dnf/usr-drift-protected-paths.d/CMakeLists.txt
@@ -0,0 +1 @@
+INSTALL(DIRECTORY DESTINATION ${SYSCONFDIR}/dnf/usr-drift-protected-paths.d)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+INSTALL(DIRECTORY DESTINATION ${SYSCONFDIR}/dnf/usr-drift-protected-paths.d)`