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

!85 resolve wantedby invalid and fix reboot symlink not correct after reinstall

Browse Source 
From: @zhang-yao-2022 
Reviewed-by: @ 
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2024-04-10 06:13:07 +00:00 committed by Gitee
commit 1e956f5637
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
backport-fix-resolve-wantedby-invalid.patch Normal file
View File

@ -0,0 +1,27 @@
From f2d77666e409dd9ae47c36680e9380900f02b6b9 Mon Sep 17 00:00:00 2001
From: zhangyao2022 <zhangyao108@huawei.com>
Date: Tue, 9 Apr 2024 16:04:45 +0800
Subject: [PATCH] fix: resolve wantedby invalid
---
core/sysmaster/src/manager/pre_install.rs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/core/sysmaster/src/manager/pre_install.rs b/core/sysmaster/src/manager/pre_install.rs
index 69823478..7032117c 100644
--- a/core/sysmaster/src/manager/pre_install.rs
+++ b/core/sysmaster/src/manager/pre_install.rs
@@ -543,9 +543,7 @@ impl Install {
let mut paths: Vec<PathBuf> = Vec::new();
for p in &self.lookup_path.search_path {
- let mut path = String::new();
- path = path + p + &unit_install.name();
- paths.push(PathBuf::from(path));
+ paths.push(Path::new(p).join(&unit_install.name()));
}
let configer = match UeConfigData::load_config(paths, &unit_install.name()) {
--
2.33.0

12
sysmaster.spec
View File

@ -12,14 +12,15 @@
Name: sysmaster
Version: 1.0.0
Release: 2
Release: 3
Summary: redesign and reimplement process1.
License: Mulan PSL v2
URL: https://gitee.com/openeuler/sysmaster
Source0: %{name}-%{version}.tar.xz
Patch0: backport-feature-devmaster-add-net_driver-builtin-to-be-compa.patch
Patch0: backport-feature-devmaster-add-net_driver-builtin-to-be-compa.patch
Patch1: backport-fix-resolve-wantedby-invalid.patch
ExclusiveArch: x86_64 aarch64
@ -137,7 +138,7 @@ sed -i 's/\"\/lib\/devmaster\/rules.d\"/&, \"\/etc\/udev\/rules.d\", \"\/run\/ud
/etc/sysmaster/system/sysinit.target.wants/devmaster.service
/etc/sysmaster/system/multi-user.target.wants/devctl-trigger.service
%post -n sysmaster
%posttrans -n sysmaster
test -f /usr/bin/sctl && ln -sf ../bin/sctl /usr/sbin/reboot || :
test -f /usr/bin/sctl && ln -sf ../bin/sctl /usr/sbin/shutdown || :
test -f /usr/bin/sctl && ln -sf ../bin/sctl /usr/sbin/poweroff || :
@ -150,7 +151,7 @@ test -f /usr/bin/systemctl && ln -sf ../bin/systemctl /usr/sbin/poweroff || :
test -f /usr/bin/systemctl && ln -sf ../bin/systemctl /usr/sbin/halt || :
%post -n devmaster
%posttrans -n devmaster
test -f /etc/sysmaster/system/sysinit.target.wants/udevd.service && unlink /etc/sysmaster/system/sysinit.target.wants/udevd.service || :
test -f /etc/sysmaster/system/sysinit.target.wants/udev-trigger.service && unlink /etc/sysmaster/system/sysinit.target.wants/udev-trigger.service || :
@ -161,6 +162,9 @@ if [ $1 -eq 0 ] ; then
fi
%changelog
* Wed Apr 10 2024 zhangyao<zhangyao108@huawei.com> - 1.0.0-3
- resolve wantedby invalid and fix reboot symlink not correct after reinstall
* Tue Apr 9 2024 chenjiayi<chenjiayi22@huawei.com> - 1.0.0-2
- sync patches from upstream