packages/anaconda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the systemd generator for systemd 253

Browse Source 
(cherry picked from commit c379aaa5f273e9394ae343bdd6e2873bd4ac4fe8)
This commit is contained in:
sun_hai_10 2023-08-30 20:27:30 +08:00 committed by openeuler-sync-bot
parent 2d958642aa
commit be3e127d90
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
anaconda.spec
View File

@ -1,7 +1,7 @@
%define _empty_manifest_terminate_build 0 %define _empty_manifest_terminate_build 0
Name: anaconda Name: anaconda
Version: 36.16.5 Version: 36.16.5
Release: 21 Release: 22
Summary: Graphical system installer Summary: Graphical system installer
License: GPLv2+ and MIT License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda 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 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 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 dasbusver 1.3
%define dbusver 1.2.3 %define dbusver 1.2.3
@ -300,6 +301,12 @@ update-desktop-database &> /dev/null || :
%{_prefix}/libexec/anaconda/dd_* %{_prefix}/libexec/anaconda/dd_*
%changelog %changelog
* Wed Aug 30 2023 sunhai <sunhai10@huawei.com> - 36.16.5-22
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: Fix the systemd generator for systemd 253
* Mon Aug 21 2023 sunhai <sunhai10@huawei.com> - 36.16.5-21 * Mon Aug 21 2023 sunhai <sunhai10@huawei.com> - 36.16.5-21
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA

46
backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch Normal file
View File

@ -0,0 +1,46 @@
From 2cd57fee4d66ab8df06afe089da80a5e20168f25 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
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 <awilliam@redhat.com>
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