diff --git a/anaconda.spec b/anaconda.spec index 4d94e00..ba29bce 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 21 +Release: 22 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -51,6 +51,7 @@ Patch9022: bugfix-change-the-startup-mode-of-do_transaction-sub-proces.patch Patch6007: backport-Don-t-attempt-to-add-frozen-python-modules-to-initramfs.patch Patch6008: backport-module-setup.sh-Don-t-ignore-errors-unbound-variable-and-pipe-fails.patch +Patch6009: backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch %define dasbusver 1.3 %define dbusver 1.2.3 @@ -300,6 +301,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Aug 30 2023 sunhai - 36.16.5-22 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: Fix the systemd generator for systemd 253 + * Mon Aug 21 2023 sunhai - 36.16.5-21 - Type:bugfix - ID:NA diff --git a/backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch b/backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch new file mode 100644 index 0000000..6167852 --- /dev/null +++ b/backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch @@ -0,0 +1,46 @@ +From 2cd57fee4d66ab8df06afe089da80a5e20168f25 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 1 Feb 2023 08:26:31 -0800 +Subject: [PATCH] Fix the systemd generator for systemd 253 (#2165433) + +As Zbyszek explained in +https://bugzilla.redhat.com/show_bug.cgi?id=2165433#c5 , +generators aren't supposed to write outside the special locations +passed to them as args. Just writing the files into the first +of the provided locations seems to work fine (tested that this +fixes both text install and rescue mode). + +Signed-off-by: Adam Williamson + +Conflict:https://github.com/rhinstaller/anaconda/commit/2cd57fee4d66ab8df06afe089da80a5e20168f25 +Reference:https://github.com/rhinstaller/anaconda/commit/2cd57fee4d66ab8df06afe089da80a5e20168f25 + +--- + data/systemd/anaconda-generator | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/data/systemd/anaconda-generator b/data/systemd/anaconda-generator +index 5791678609..c9a5230cae 100755 +--- a/data/systemd/anaconda-generator ++++ b/data/systemd/anaconda-generator +@@ -11,8 +11,8 @@ fi + + # set up dirs + systemd_dir=/lib/systemd/system +-target_dir=$systemd_dir/anaconda.target.wants +-mkdir -p $target_dir ++target_dir="$1/anaconda.target.wants" ++mkdir -p "$target_dir" + + # create symlink anaconda.target.wants/SERVICE@TTY.service + service_on_tty() { +@@ -41,5 +41,5 @@ for tty in hvc0 hvc1 xvc0 hvsi0 hvsi1 hvsi2; do + fi + done + +-ln -sf $systemd_dir/anaconda-nm-config.service $target_dir/anaconda-nm-config.service +-ln -sf $systemd_dir/anaconda-pre.service $target_dir/anaconda-pre.service ++ln -sf "$systemd_dir/anaconda-nm-config.service" "$target_dir/anaconda-nm-config.service" ++ln -sf "$systemd_dir/anaconda-pre.service" "$target_dir/anaconda-pre.service" +-- +2.23.0 \ No newline at end of file