delete unused patch files
(cherry picked from commit 0b021eef15e6fc50b960560f18520e9d3fb24720)
This commit is contained in:
parent
e98ea1cbdc
commit
ee2b4f73a8
@ -1,35 +0,0 @@
|
|||||||
From 22239a861897fcd7c4d16f728c4bb40d84793961 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
||||||
Date: Wed, 2 Feb 2022 14:05:45 +0900
|
|
||||||
Subject: [PATCH] core/mount: fail early if directory cannot be created
|
|
||||||
|
|
||||||
Prompted by #22334.
|
|
||||||
|
|
||||||
(cherry picked from commit e4de58c8231e47509ffeb3aa47620ca42f22d7f6)
|
|
||||||
(cherry picked from commit 1d7e0b68048ba0760f8fdf6a26c7a5017ac38569)
|
|
||||||
|
|
||||||
Conflict:NA
|
|
||||||
Reference:https://github.com/systemd/systemd/commit/22239a861897fcd7c4d16f728c4bb40d84793961
|
|
||||||
---
|
|
||||||
src/core/mount.c | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/core/mount.c b/src/core/mount.c
|
|
||||||
index af39db214b..673eec32b8 100644
|
|
||||||
--- a/src/core/mount.c
|
|
||||||
+++ b/src/core/mount.c
|
|
||||||
@@ -1035,8 +1035,10 @@ static void mount_enter_mounting(Mount *m) {
|
|
||||||
r = mkdir_p_label(p->what, m->directory_mode);
|
|
||||||
/* mkdir_p_label() can return -EEXIST if the target path exists and is not a directory - which is
|
|
||||||
* totally OK, in case the user wants us to overmount a non-directory inode. */
|
|
||||||
- if (r < 0 && r != -EEXIST)
|
|
||||||
+ if (r < 0 && r != -EEXIST) {
|
|
||||||
log_unit_error_errno(UNIT(m), r, "Failed to make bind mount source '%s': %m", p->what);
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (p) {
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
@ -21,7 +21,7 @@
|
|||||||
Name: systemd
|
Name: systemd
|
||||||
Url: https://www.freedesktop.org/wiki/Software/systemd
|
Url: https://www.freedesktop.org/wiki/Software/systemd
|
||||||
Version: 249
|
Version: 249
|
||||||
Release: 45
|
Release: 46
|
||||||
License: MIT and LGPLv2+ and GPLv2+
|
License: MIT and LGPLv2+ and GPLv2+
|
||||||
Summary: System and Service Manager
|
Summary: System and Service Manager
|
||||||
|
|
||||||
@ -1910,6 +1910,9 @@ fi
|
|||||||
%{_libdir}/security/pam_systemd.so
|
%{_libdir}/security/pam_systemd.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 19 2023 yangmingtai <yangmingtai@huawei.com> -249-46
|
||||||
|
- delete unused patch files
|
||||||
|
|
||||||
* Fri Jan 13 2023 yangmingtai <yangmingtai@huawei.com> -249-45
|
* Fri Jan 13 2023 yangmingtai <yangmingtai@huawei.com> -249-45
|
||||||
- backport patches from upstream and add patchs to enhance compatibility
|
- backport patches from upstream and add patchs to enhance compatibility
|
||||||
and features
|
and features
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user