diff options
| -rw-r--r-- | build-root/deb/debian/vpp.service | 1 | ||||
| -rw-r--r-- | build-root/deb/debian/vpp.upstart | 3 | ||||
| -rw-r--r-- | src/vlibmemory/memory_api.c | 22 |
3 files changed, 23 insertions, 3 deletions
diff --git a/build-root/deb/debian/vpp.service b/build-root/deb/debian/vpp.service index aa1651c4119..2e86941de8b 100644 --- a/build-root/deb/debian/vpp.service +++ b/build-root/deb/debian/vpp.service @@ -4,7 +4,6 @@ After=network.target [Service] Type=simple -ExecStartPre=-/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api ExecStartPre=-/sbin/modprobe uio_pci_generic ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api diff --git a/build-root/deb/debian/vpp.upstart b/build-root/deb/debian/vpp.upstart index 62e1d2780e6..4a451dd45d0 100644 --- a/build-root/deb/debian/vpp.upstart +++ b/build-root/deb/debian/vpp.upstart @@ -1,12 +1,11 @@ description "vector packet processing engine" -author "Cisco Systems, Inc <listname@cisco.com>" +author "Cisco Systems, Inc <vpp-dev@lists.fd.io>" manual respawn pre-start script - rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api || true # should be there via dkms, but if not, start anyway modprobe uio_pci_generic || true end script diff --git a/src/vlibmemory/memory_api.c b/src/vlibmemory/memory_api.c index 7a7644a0998..544e59ddb69 100644 --- a/src/vlibmemory/memory_api.c +++ b/src/vlibmemory/memory_api.c @@ -932,6 +932,28 @@ vlibmemory_init (vlib_main_t * vm) api_main_t *am = &api_main; svm_map_region_args_t _a, *a = &_a; clib_error_t *error; + u8 *remove_path1, *remove_path2; + + /* + * By popular request / to avoid support fires, remove any old api segment + * files Right Here. + */ + if (am->root_path == 0) + { + remove_path1 = format (0, "/dev/shm/global_vm%c", 0); + remove_path2 = format (0, "/dev/shm/vpe-api%c", 0); + } + else + { + remove_path1 = format (0, "/dev/shm/%s-global_vm%c", am->root_path, 0); + remove_path2 = format (0, "/dev/shm/%s-vpe-api%c", am->root_path, 0); + } + + (void) unlink ((char *) remove_path1); + (void) unlink ((char *) remove_path2); + + vec_free (remove_path1); + vec_free (remove_path2); clib_memset (a, 0, sizeof (*a)); a->root_path = am->root_path; |