commit 9404eb365b8439ca5b4ee64638c53bfd8e55ffdc
author Mike Frysinger <vapier@chromium.org> Mon Oct 23 16:19:03 2017 -0400
committer chrome-bot <chrome-bot@chromium.org> Wed Oct 25 01:38:45 2017 -0700
tree 437d033c41613726115d6dd1f86bf210d1394324
parent 864c20bfbd6c2cacb3bf4e9688106a7c9bcf7233

mod_for_test_scripts: convert to /run

Since /var/run is a symlink to /run, and we want to avoid going
through the stateful /var whenever possible, use the direct path.

BUG=chromium:699880
TEST=precq passes

Change-Id: I1f13029d06e2e177433acf555317685701551632
Reviewed-on: https://chromium-review.googlesource.com/733609
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>

mod_for_test_scripts/100setupTestingInterface

diff --git a/mod_for_test_scripts/100setupTestingInterface b/mod_for_test_scripts/100setupTestingInterface
index a3f7112..662aaec 100755
--- a/mod_for_test_scripts/100setupTestingInterface
+++ b/mod_for_test_scripts/100setupTestingInterface
@@ -25,7 +25,7 @@
 # installation as a host route.
 cat > ${ROOT_FS_DIR}/etc/udev/rules.d/50-backchannel-network.rules <<EOF
 KERNEL=="eth*", SUBSYSTEMS=="usb", ACTION=="add", RUN+="/sbin/backchannel-setup %k"
-KERNEL=="${testif}", SUBSYSTEMS=="usb", ACTION=="remove", RUN+="kill \$(cat /var/run/dhclient-%k.pid)"
+KERNEL=="${testif}", SUBSYSTEMS=="usb", ACTION=="remove", RUN+="kill \$(cat /run/dhclient-%k.pid)"
 EOF
 
 cat > ${ROOT_FS_DIR}/sbin/backchannel-setup <<EOF
@@ -38,7 +38,7 @@
     exit
 fi
 
-if [ -f /var/run/dhclient-\${testif}.pid ]; then
+if [ -f /run/dhclient-\${testif}.pid ]; then
     # Something else is already going on - perhaps a second
     # USB Ethernet device has been inserted. Let's not mess with it.
     exit
@@ -62,8 +62,8 @@
 fi
 
 # Bring up the backchannel interface
-dhclient -q -pf /var/run/dhclient-\${testif}.pid \\
-            -lf /var/run/dhclient-\${testif}.leases \\
+dhclient -q -pf /run/dhclient-\${testif}.pid \\
+            -lf /run/dhclient-\${testif}.leases \\
             -cf /etc/dhclient-backchannel.conf \\
             -sf /sbin/dhclient-backchannel-script \\
          \${testif}
@@ -119,9 +119,9 @@
             # Since this script is for the backchannel testing interface,
             # we don't set the default route from here, but we do stash
             # it for possible later use in setting up a host route.
-            cp /dev/null /var/run/dhclient-\${interface}.routers
+            cp /dev/null /run/dhclient-\${interface}.routers
             for router in \$new_routers; do
-                echo \$router >> /var/run/dhclient-\${interface}.routers
+                echo \$router >> /run/dhclient-\${interface}.routers
             done
         fi
         ;;