diff options
| author | Dimitri Staessens <[email protected]> | 2018-05-15 13:46:59 +0200 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2018-05-15 20:45:15 +0200 |
| commit | a1f426f464989d8d045435f1f396719d29bcbdb2 (patch) | |
| tree | 6cdae48a435e4e89b14a3200b45cb9ee6b5f28e7 | |
| parent | 38cfdc212c623a46038f005b0c1604c3fdaf3762 (diff) | |
| download | ouroboros-a1f426f464989d8d045435f1f396719d29bcbdb2.tar.gz ouroboros-a1f426f464989d8d045435f1f396719d29bcbdb2.zip | |
lib: Use IPCP name as RIB directory
This will change the FUSE mountpount to the name of the IPCP instead
of a generic name based on its pid.
Signed-off-by: Dimitri Staessens <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>
| -rw-r--r-- | src/ipcpd/normal/main.c | 2 | ||||
| -rw-r--r-- | src/lib/rib.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c index 152f7640..b131bbb6 100644 --- a/src/ipcpd/normal/main.c +++ b/src/ipcpd/normal/main.c @@ -304,7 +304,7 @@ int main(int argc, } /* These components must be init at creation. */ - if (rib_init("ipcpd-normal")) { + if (rib_init(ipcpi.name)) { log_err("Failed to initialize RIB."); goto fail_rib_init; } diff --git a/src/lib/rib.c b/src/lib/rib.c index fa525c50..22397e24 100644 --- a/src/lib/rib.c +++ b/src/lib/rib.c @@ -261,7 +261,7 @@ static void * fuse_thr(void * o) #endif /* HAVE_FUSE */ -int rib_init(const char * prefix) +int rib_init(const char * mountpt) { #ifdef HAVE_FUSE struct stat st; @@ -277,7 +277,7 @@ int rib_init(const char * prefix) if (stat(FUSE_PREFIX, &st) == -1) return -1; - sprintf(rib.mnt, FUSE_PREFIX "/%s.%d", prefix, getpid()); + sprintf(rib.mnt, FUSE_PREFIX "/%s", mountpt); if (stat(rib.mnt, &st) == -1) switch(errno) { |