From: Dave Barach <dave@barachs.net>
Date: Wed, 4 May 2016 13:42:07 +0000 (-0400)
Subject: VPP-12: only remove vpp-related files from /dev/shm
X-Git-Tag: v16.06-rc1~49
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=9942bba79fe81e080ce334111ea7a0cca43dd210;p=vpp.git

VPP-12: only remove vpp-related files from /dev/shm

Change-Id: I1b6983a6d23d3d2635814cdd307efa25cd5c8b7b
Signed-off-by: Dave Barach <dave@barachs.net>
---

diff --git a/build-root/deb/debian/vpp.service b/build-root/deb/debian/vpp.service
index a2849296cdc..40549856a96 100644
--- a/build-root/deb/debian/vpp.service
+++ b/build-root/deb/debian/vpp.service
@@ -4,10 +4,10 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStartPre=-/bin/rm -f /dev/shm/* 
+ExecStartPre=-/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api 
 ExecStartPre=-/sbin/modprobe igb_uio
 ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf
-ExecStopPost=/bin/rm -f /dev/shm/*
+ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api 
 Restart=always
 
 [Install]
diff --git a/build-root/deb/debian/vpp.upstart b/build-root/deb/debian/vpp.upstart
index c0ff09e2c16..f5908783d11 100644
--- a/build-root/deb/debian/vpp.upstart
+++ b/build-root/deb/debian/vpp.upstart
@@ -6,7 +6,7 @@ manual
 respawn
 
 pre-start script
-   rm -f /dev/shm/* || true
+   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 igb_uio || true
 end script
@@ -17,5 +17,5 @@ script
 end script
 
 post-stop script
-   rm -f /dev/shm/* || true
+   rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api || true
 end script