fix systemdActive()
This commit is contained in:
parent
efdc2fafb6
commit
f59a4d709b
44
backport-leveldb-fix-systemdActive.patch
Normal file
44
backport-leveldb-fix-systemdActive.patch
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
From 5b5268cc2d7fec04365996026f64992db6c45aa9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marcos Mello <marcosfrm@gmail.com>
|
||||||
|
Date: Sun, 15 Oct 2023 14:35:06 -0300
|
||||||
|
Subject: [PATCH] leveldb: fix systemdActive()
|
||||||
|
|
||||||
|
/sys/fs/cgroup/systemd is long gone:
|
||||||
|
|
||||||
|
https://systemd.io/CGROUP_DELEGATION/
|
||||||
|
|
||||||
|
Check for /run/systemd/system/ directory existence instead:
|
||||||
|
|
||||||
|
https://www.freedesktop.org/software/systemd/man/sd_booted.html
|
||||||
|
|
||||||
|
Closes fedora-sysv/chkconfig#116
|
||||||
|
|
||||||
|
Reference:https://github.com/fedora-sysv/chkconfig/commit/5b5268cc2d7fec04365996026f64992db6c45aa9
|
||||||
|
Conflict:NA
|
||||||
|
|
||||||
|
---
|
||||||
|
leveldb.c | 8 +-------
|
||||||
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/leveldb.c b/leveldb.c
|
||||||
|
index 7b8c1bd..564a207 100644
|
||||||
|
--- a/leveldb.c
|
||||||
|
+++ b/leveldb.c
|
||||||
|
@@ -946,13 +946,7 @@ int systemdIsInit() {
|
||||||
|
}
|
||||||
|
|
||||||
|
int systemdActive() {
|
||||||
|
- struct stat a, b;
|
||||||
|
-
|
||||||
|
- if (lstat("/sys/fs/cgroup", &a) < 0)
|
||||||
|
- return 0;
|
||||||
|
- if (lstat("/sys/fs/cgroup/systemd", &b) < 0)
|
||||||
|
- return 0;
|
||||||
|
- if (a.st_dev == b.st_dev)
|
||||||
|
+ if (access("/run/systemd/system/", F_OK) < 0)
|
||||||
|
return 0;
|
||||||
|
if (!systemdIsInit())
|
||||||
|
return 0;
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Summary: A system tool for maintaining the /etc/rc*.d hierarchy
|
Summary: A system tool for maintaining the /etc/rc*.d hierarchy
|
||||||
Name: chkconfig
|
Name: chkconfig
|
||||||
Version: 1.25
|
Version: 1.25
|
||||||
Release: 1
|
Release: 2
|
||||||
License: GPL-2.0-only
|
License: GPL-2.0-only
|
||||||
URL: https://github.com/fedora-sysv/chkconfig
|
URL: https://github.com/fedora-sysv/chkconfig
|
||||||
Source: https://github.com/fedora-sysv/chkconfig/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source: https://github.com/fedora-sysv/chkconfig/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
@ -13,6 +13,8 @@ Provides: /sbin/chkconfig
|
|||||||
|
|
||||||
Patch0: fix-coredump-while-parseServiceInfo-return-1.patch
|
Patch0: fix-coredump-while-parseServiceInfo-return-1.patch
|
||||||
|
|
||||||
|
Patch6000: backport-leveldb-fix-systemdActive.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Chkconfig is a basic system utility. It updates and queries runlevel
|
Chkconfig is a basic system utility. It updates and queries runlevel
|
||||||
information for system services. Chkconfig manipulates the numerous
|
information for system services. Chkconfig manipulates the numerous
|
||||||
@ -57,6 +59,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d
|
|||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 12 2024 fuanan <fuanan3@h-partners.com> - 1.25-2
|
||||||
|
- fix systemdActive()
|
||||||
|
|
||||||
* Fri Aug 4 2023 dillon chen <dillon.chen@gmail.com> - 1.25-1
|
* Fri Aug 4 2023 dillon chen <dillon.chen@gmail.com> - 1.25-1
|
||||||
- update version to 1.25
|
- update version to 1.25
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user