summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--src/shared/fdset.c (renamed from src/basic/fdset.c)0
-rw-r--r--src/shared/fdset.h (renamed from src/basic/fdset.h)0
-rw-r--r--src/systemctl/systemctl.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 3c13acf28d..02329284f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -836,8 +836,6 @@ libbasic_la_SOURCES = \
src/basic/ordered-set.c \
src/basic/bitmap.c \
src/basic/bitmap.h \
- src/basic/fdset.c \
- src/basic/fdset.h \
src/basic/prioq.c \
src/basic/prioq.h \
src/basic/web-util.c \
@@ -1050,7 +1048,9 @@ libshared_la_SOURCES = \
src/shared/vlan-util.h \
src/shared/vlan-util.c \
src/shared/tests.h \
- src/shared/tests.c
+ src/shared/tests.c \
+ src/shared/fdset.c \
+ src/shared/fdset.h
if HAVE_UTMP
libshared_la_SOURCES += \
diff --git a/src/basic/fdset.c b/src/shared/fdset.c
index 527f27bc67..527f27bc67 100644
--- a/src/basic/fdset.c
+++ b/src/shared/fdset.c
diff --git a/src/basic/fdset.h b/src/shared/fdset.h
index 16efe5bdf2..16efe5bdf2 100644
--- a/src/basic/fdset.h
+++ b/src/shared/fdset.h
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 0dfdae4538..38b5a7e082 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6093,7 +6093,7 @@ static int get_file_to_edit(
return log_oom();
if (arg_runtime) {
- run = strjoin(paths->runtime_config, name, NULL);
+ run = strjoin(paths->runtime_config, "/", name, NULL);
if (!run)
return log_oom();
}