Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1177)

Unified Diff: src/scripts/mod_for_test_scripts/100setupTestingInterface

Issue 2731001: s/connman/flimflam/ to match other changes (Closed) Base URL: ssh://gitrw.chromium.org/chromiumos
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/scripts/mod_for_test_scripts/100setupTestingInterface
diff --git a/src/scripts/mod_for_test_scripts/100setupTestingInterface b/src/scripts/mod_for_test_scripts/100setupTestingInterface
index f5b84961150f6f7708529fdd39c452ba33c08d31..65eca0b86e6898773d00578bcec63fb946014dd2 100755
--- a/src/scripts/mod_for_test_scripts/100setupTestingInterface
+++ b/src/scripts/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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698