summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/dev.c8
-rw-r--r--src/lib/rib.c7
2 files changed, 5 insertions, 10 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c
index fbbc096d..723e3350 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -443,9 +443,11 @@ static void init(int argc,
goto fail_timerwheel;
#if defined PROC_FLOW_STATS
- sprintf(procstr, "proc.%d", getpid());
- /* Don't bail, it just won't show metrics */
- rib_init(procstr);
+ if (strstr(argv[0], "ipcpd") == NULL) {
+ sprintf(procstr, "proc.%d", getpid());
+ /* Don't bail on fail, it just won't show metrics */
+ rib_init(procstr);
+ }
#endif
return;
diff --git a/src/lib/rib.c b/src/lib/rib.c
index 8fda19d4..27c66f2f 100644
--- a/src/lib/rib.c
+++ b/src/lib/rib.c
@@ -29,7 +29,6 @@
#include <ouroboros/rib.h>
#include <ouroboros/utils.h>
-
#include <assert.h>
#include <pthread.h>
#include <stdio.h>
@@ -292,12 +291,6 @@ int rib_init(const char * mountpt)
if (stat(FUSE_PREFIX, &st) == -1)
goto fail;
- /* This is crap to allow IPCP RIB to remount to a different name */
- if (strlen(rib.mnt) > 0) {
- fuse_unmount(rib.mnt, rib.ch);
- rmdir(rib.mnt);
- }
-
sprintf(rib.mnt, FUSE_PREFIX "/%s", mountpt);
if (stat(rib.mnt, &st) == -1)