From ed903f64fdbf364f4472c15202112042f5a95802 Mon Sep 17 00:00:00 2001
From: Paul Stewart <pstew@google.com>
Date: Tue, 8 Jun 2010 09:49:11 -0700
Subject: [PATCH] s/connman/flimflam/ to match other changes throughout the
 tree.

Review URL: http://codereview.chromium.org/2731001
---
 mod_for_test_scripts/100setupTestingInterface | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod_for_test_scripts/100setupTestingInterface b/mod_for_test_scripts/100setupTestingInterface
index f5b8496115..65eca0b86e 100755
--- a/mod_for_test_scripts/100setupTestingInterface
+++ b/mod_for_test_scripts/100setupTestingInterface
@@ -8,10 +8,10 @@ echo "Configuring for backchannel network device"
 
 testif=eth_test
 
-# Prevent connman from taking control of the backchannel network device.
-ORIG_CONF=${ROOT_FS_DIR}/etc/init/connman.conf
+# Prevent flimflam from taking control of the backchannel network device.
+ORIG_CONF=${ROOT_FS_DIR}/etc/init/flimflam.conf
 TEMP_CONF=${ORIG_CONF}.tmp
-sed "s/connmand -W/connmand -I ${testif} -W/" ${ORIG_CONF} > ${TEMP_CONF}
+sed "s/flimflamd -W/flimflamd -I ${testif} -W/" ${ORIG_CONF} > ${TEMP_CONF}
 mv -f ${TEMP_CONF} ${ORIG_CONF}
 
 # Arrange to run dhclient on the backchannel device but without
@@ -39,7 +39,7 @@ if [ -f /var/run/dhclient-\${testif}.pid ]; then
 fi
 
 if [ "\$1" != "\${testif}" ]; then
-    initctl stop connman
+    initctl stop flimflam
     # \$1 is the current name of the backchannel device. Swap it with testif.
     if ifconfig \${testif} > /dev/null 2>&1; then
         orig_mac=\$(ifconfig \${testif} | awk '/HWaddr/ {print \$5}')
@@ -52,7 +52,7 @@ if [ "\$1" != "\${testif}" ]; then
     if [ -n "\${orig_mac}" ]; then
         nameif \$1 \${orig_mac}
     fi
-    initctl start connman
+    initctl start flimflam
 fi
 
 # Bring up the backchannel interface