2 files changed, 2 insertions, 6 deletions
diff --git a/templates/protocols/static/route6/node.tag/blackhole/node.def b/templates/protocols/static/route6/node.tag/blackhole/node.def
index bd8601d5..a4066ee6 100644
--- a/templates/protocols/static/route6/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route6/node.tag/blackhole/node.def
@@ -1,10 +1,8 @@
 help: Set to silently discard pkts when matched
-delete:expression: "touch /tmp/static.$PPID"
 
-end: if [ -f "/tmp/static.$PPID" ]; then 
+end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then 
         vyatta-vtysh -c "configure terminal" \
           -c "no ipv6 route $VAR(../@) null0";
-        rm /tmp/static.$PPID;
      else
         if [ -n "$VAR(./distance/@)" ]; then
 	   DIST="$VAR(./distance/@)";
diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.def
index 3f9cd440..e58c4fcc 100644
--- a/templates/protocols/static/route6/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route6/node.tag/next-hop/node.def
@@ -1,12 +1,10 @@
 tag:
 type: ipv6
 help: Set the next-hop IPv6 router
-delete: touch /tmp/static.$PPID
-end: if [ -f "/tmp/static.$PPID" ]; then 
+end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then 
         if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl "$VAR(../@)" "$VAR(@)"; then 
            vyatta-vtysh -c "configure terminal" -c "no ipv6 route $VAR(../@) $VAR(@)" ; 
         fi;
-        rm /tmp/static.$PPID; 
      else 
         if [ -n "$VAR(./distance/@)" ]; then
 	   DIST="$VAR(./distance/@)";