chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnome-ask-password-agent: restore removed libnotify0.6 support
[elogind.git]
/
src
/
service.c
diff --git
a/src/service.c
b/src/service.c
index 017b546d8cca0dacb6eb527d0fe0ec8095f2cc3b..70999f354511bc89962d06339c7c2ecb16f887a7 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-275,7
+275,13
@@
static int sysv_translate_facility(const char *name, const char *filename, char
static const char * const table[] = {
/* LSB defined facilities */
"local_fs", SPECIAL_LOCAL_FS_TARGET,
static const char * const table[] = {
/* LSB defined facilities */
"local_fs", SPECIAL_LOCAL_FS_TARGET,
+#ifndef TARGET_MANDRIVA
+ /* Due to unfortunate name selection in Mandriva,
+ * $network is provided by network-up which is ordered
+ * after network which actually starts interfaces.
+ * To break the loop, just ignore it */
"network", SPECIAL_NETWORK_TARGET,
"network", SPECIAL_NETWORK_TARGET,
+#endif
"named", SPECIAL_NSS_LOOKUP_TARGET,
"portmap", SPECIAL_RPCBIND_TARGET,
"remote_fs", SPECIAL_REMOTE_FS_TARGET,
"named", SPECIAL_NSS_LOOKUP_TARGET,
"portmap", SPECIAL_RPCBIND_TARGET,
"remote_fs", SPECIAL_REMOTE_FS_TARGET,
@@
-835,7
+841,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
if (description) {
char *d;
if (description) {
char *d;
- if (!(d = strappend(
"LSB
: ", description))) {
+ if (!(d = strappend(
s->sysv_has_lsb ? "LSB: " : "SYSV
: ", description))) {
r = -ENOMEM;
goto finish;
}
r = -ENOMEM;
goto finish;
}