Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de>
Signed-off-by: Sebastian Krahmer <krahmer(a)suse.com>
---
teamd/teamd.c | 8 ++++----
teamd/teamd_usock.c | 4 ----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/teamd/teamd.c b/teamd/teamd.c
index 764e4f6..cdf1fc3 100644
--- a/teamd/teamd.c
+++ b/teamd/teamd.c
@@ -1621,10 +1621,6 @@ static int teamd_set_default_pid_file(struct teamd_context *ctx)
if (ctx->pid_file)
return 0;
- err = teamd_make_rundir();
- if (err)
- return err;
-
err = asprintf(&ctx->pid_file, TEAMD_RUN_DIR"%s.pid",
ctx->team_devname);
if (err == -1) {
teamd_log_err("Failed allocate memory for PID file string.");
@@ -1676,6 +1672,10 @@ int main(int argc, char **argv)
int err;
struct teamd_context *ctx;
+ err = teamd_make_rundir();
+ if (err)
+ return ret;
+
err = teamd_context_init(&ctx);
if (err) {
fprintf(stderr, "Failed to init daemon context\n");
diff --git a/teamd/teamd_usock.c b/teamd/teamd_usock.c
index 967f68c..c421c7a 100644
--- a/teamd/teamd_usock.c
+++ b/teamd/teamd_usock.c
@@ -298,10 +298,6 @@ static int teamd_usock_sock_open(struct teamd_context *ctx)
int sock;
int err;
- err = teamd_make_rundir();
- if (err)
- return err;
-
sock = socket(AF_UNIX, SOCK_SEQPACKET, 0);
if (sock == -1) {
teamd_log_err("usock: Failed to create socket.");
--
2.1.4
Show replies by date