chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
everywhere: remove configurability of sysv runlevel to target mapping
[elogind.git]
/
src
/
dbus1-generator
/
dbus1-generator.c
diff --git
a/src/dbus1-generator/dbus1-generator.c
b/src/dbus1-generator/dbus1-generator.c
index ca737e3d1bf77d3ad260353198a135e756e65544..2e08af2df292e5037caeb81046da3cf2f74ee144 100644
(file)
--- a/
src/dbus1-generator/dbus1-generator.c
+++ b/
src/dbus1-generator/dbus1-generator.c
@@
-164,7
+164,7
@@
static int add_dbus(const char *path, const char *fname, const char *type) {
assert(path);
assert(fname);
assert(path);
assert(fname);
- p = str
append
a(path, "/", fname);
+ p = str
join
a(path, "/", fname);
r = config_parse(NULL, p, NULL,
"D-BUS Service\0",
config_item_table_lookup, table,
r = config_parse(NULL, p, NULL,
"D-BUS Service\0",
config_item_table_lookup, table,
@@
-250,8
+250,8
@@
fail:
static int link_busnames_target(const char *units) {
const char *f, *t;
static int link_busnames_target(const char *units) {
const char *f, *t;
- f = str
append
a(units, "/" SPECIAL_BUSNAMES_TARGET);
- t = str
append
a(arg_dest, "/" SPECIAL_BASIC_TARGET ".wants/" SPECIAL_BUSNAMES_TARGET);
+ f = str
join
a(units, "/" SPECIAL_BUSNAMES_TARGET);
+ t = str
join
a(arg_dest, "/" SPECIAL_BASIC_TARGET ".wants/" SPECIAL_BUSNAMES_TARGET);
mkdir_parents_label(t, 0755);
if (symlink(f, t) < 0)
mkdir_parents_label(t, 0755);
if (symlink(f, t) < 0)
@@
-263,19
+263,19
@@
static int link_busnames_target(const char *units) {
static int link_compatibility(const char *units) {
const char *f, *t;
static int link_compatibility(const char *units) {
const char *f, *t;
- f = str
append
a(units, "/systemd-bus-proxyd.socket");
- t = str
append
a(arg_dest, "/" SPECIAL_DBUS_SOCKET);
+ f = str
join
a(units, "/systemd-bus-proxyd.socket");
+ t = str
join
a(arg_dest, "/" SPECIAL_DBUS_SOCKET);
mkdir_parents_label(t, 0755);
if (symlink(f, t) < 0)
return log_error_errno(errno, "Failed to create symlink %s: %m", t);
mkdir_parents_label(t, 0755);
if (symlink(f, t) < 0)
return log_error_errno(errno, "Failed to create symlink %s: %m", t);
- f = str
append
a(units, "/systemd-bus-proxyd.socket");
- t = str
append
a(arg_dest, "/" SPECIAL_SOCKETS_TARGET ".wants/systemd-bus-proxyd.socket");
+ f = str
join
a(units, "/systemd-bus-proxyd.socket");
+ t = str
join
a(arg_dest, "/" SPECIAL_SOCKETS_TARGET ".wants/systemd-bus-proxyd.socket");
mkdir_parents_label(t, 0755);
if (symlink(f, t) < 0)
return log_error_errno(errno, "Failed to create symlink %s: %m", t);
mkdir_parents_label(t, 0755);
if (symlink(f, t) < 0)
return log_error_errno(errno, "Failed to create symlink %s: %m", t);
- t = str
append
a(arg_dest, "/" SPECIAL_DBUS_SERVICE);
+ t = str
join
a(arg_dest, "/" SPECIAL_DBUS_SERVICE);
if (symlink("/dev/null", t) < 0)
return log_error_errno(errno, "Failed to mask %s: %m", t);
if (symlink("/dev/null", t) < 0)
return log_error_errno(errno, "Failed to mask %s: %m", t);