rpms/chkconfig
7
0
Fork 0
Code Issues Pull Requests Releases Activity

1.3.59

Browse Source
This commit is contained in:
Bill Nottingham 2012-03-07 12:25:43 -05:00
parent 64f7773711
commit 5abe1b5ecf
5 changed files with 7 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
/chkconfig-1.3.58.tar.bz2
/chkconfig-1.3.59.tar.bz2

36
3c9dcf4bf26658ebea02cc942ca1c859de8efcc4.patch
View File

@ -1,36 +0,0 @@
commit 3c9dcf4bf26658ebea02cc942ca1c859de8efcc4
Author: Bill Nottingham <notting@redhat.com>
Date: Tue Jan 17 11:47:06 2012 -0500
If merely passed a service to check enablement, make sure to initialize the current runlevel if it's not specified. (#782152)
diff --git a/chkconfig.c b/chkconfig.c
index 8a29b89..a01afce 100644
--- a/chkconfig.c
+++ b/chkconfig.c
@@ -799,8 +799,11 @@ int main(int argc, const char ** argv) {
return !s.levels;
else
return 1;
- } else
+ } else {
+ if (level == -1)
+ level = currentRunlevel();
return s.currentLevels & (1 << level) ? 0 : 1;
+ }
} else if (!strcmp(state, "on")) {
if (!noRedirectItem) {
forwardSystemd(name, type, "enable");
diff --git a/po/chkconfig.pot b/po/chkconfig.pot
index 76d8fc1..13f9990 100644
--- a/po/chkconfig.pot
+++ b/po/chkconfig.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-04 14:17-0500\n"
+"POT-Creation-Date: 2012-01-17 11:46-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

47
7ac022a09450f49bc416e00488ef283db0e98795.patch
View File

@ -1,47 +0,0 @@
commit 7ac022a09450f49bc416e00488ef283db0e98795
Author: Bill Nottingham <notting@redhat.com>
Date: Wed Feb 1 16:04:13 2012 -0500
Rework isSimilarlyConfigured() slightly.
Even for stop dependencies, all you need to know is if the service is starting in a subset of the places its dependent service is.
diff --git a/chkconfig.c b/chkconfig.c
index a01afce..f8f759a 100644
--- a/chkconfig.c
+++ b/chkconfig.c
@@ -154,15 +154,11 @@ static inline int earlierThan(int i, int j) {
return i;
}
-static int isSimilarlyConfigured(struct service s, struct service t, int start) {
+static int isSimilarlyConfigured(struct service s, struct service t) {
int state_s, state_t;
state_s = s.currentLevels;
state_t = t.currentLevels;
- if (!start) {
- state_s = ~state_s;
- state_t = ~state_t;
- }
if ((state_s & state_t) == state_s)
return 1;
else
@@ -173,7 +169,7 @@ static void checkDeps(struct service *s, struct dep *deps, struct service *serv,
int j,k;
for (j = 0; deps[j].name ; j++) {
- if (!strcmp(deps[j].name, serv->name) && isSimilarlyConfigured(*s, *serv, start)) {
+ if (!strcmp(deps[j].name, serv->name) && isSimilarlyConfigured(*s, *serv)) {
if (start)
s->sPriority = laterThan(s->sPriority, serv->sPriority);
else
@@ -182,7 +178,7 @@ static void checkDeps(struct service *s, struct dep *deps, struct service *serv,
}
if (serv->provides) {
for (k = 0; serv->provides[k]; k++) {
- if (!strcmp(deps[j].name, serv->provides[k]) && isSimilarlyConfigured(*s, *serv, start)) {
+ if (!strcmp(deps[j].name, serv->provides[k]) && isSimilarlyConfigured(*s, *serv)) {
if (start)
s->sPriority = laterThan(s->sPriority, serv->sPriority);
else

6
chkconfig.spec
View File

@ -1,6 +1,6 @@
Summary: A system tool for maintaining the /etc/rc*.d hierarchy
Name: chkconfig
Version: 1.3.58
Version: 1.3.59
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@ -74,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/ntsysv.8*
%changelog
* Wed Mar 7 2012 Bill Nottingham <notting@redhat.com> 1.3.59-1
- translation updates
- xinetd may be a systemd service. Make sure we can still reload it (#800490)
* Fri Feb 10 2012 Bill Nottingham <notting@redhat.com> 1.3.58-1
- fix forwarding to systemctl with systemd >= 41 (#789256)
- assorted regression fixes from 1.3.57 (#782152, etc.)

2
sources
View File

@ -1 +1 @@
c2039ca67f2749fe0c06ef7c6f8ee246 chkconfig-1.3.58.tar.bz2
b2fe3a26aa0fbe89a1dae69805156b57 chkconfig-1.3.59.tar.bz2