From 544477a08f24f000918b495c449757e540372afa Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Wed, 31 Oct 2012 09:04:41 -0700 Subject: [PATCH] "flimflam" init file is now named "shill" BUG=chromium-os:35909 TEST=None Change-Id: I055068435812043eb1c31fd8a6fd2ca0b5b8017f Reviewed-on: https://gerrit.chromium.org/gerrit/37022 Reviewed-by: Christopher Wiley Commit-Ready: Paul Stewart Tested-by: Paul Stewart --- mod_for_test_scripts/100setupTestingInterface | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mod_for_test_scripts/100setupTestingInterface b/mod_for_test_scripts/100setupTestingInterface index 94b9ad27cd..646b6b88c3 100755 --- a/mod_for_test_scripts/100setupTestingInterface +++ b/mod_for_test_scripts/100setupTestingInterface @@ -9,11 +9,10 @@ echo "Configuring for backchannel network device" testif=eth_test modemif=pseudomodem0p -# Prevent flimflam from taking control of the backchannel network device. -ORIG_CONF=${ROOT_FS_DIR}/etc/init/flimflam.conf +# Prevent shill from taking control of the backchannel network device. +ORIG_CONF=${ROOT_FS_DIR}/etc/init/shill.conf TEMP_CONF=${ORIG_CONF}.tmp -sed -e "s,flimflamd,flimflamd -I ${testif} -I ${modemif}," \ - -e "s@SHILL_TEST_ARGS=\"\"@SHILL_TEST_ARGS=\"--device-black-list=${testif},${modemif}\"@" \ +sed -e "s@SHILL_TEST_ARGS=\"\"@SHILL_TEST_ARGS=\"--device-black-list=${testif},${modemif}\"@" \ ${ORIG_CONF} > ${TEMP_CONF} mv -f ${TEMP_CONF} ${ORIG_CONF} @@ -42,7 +41,7 @@ if [ -f /var/run/dhclient-\${testif}.pid ]; then fi if [ "\$1" != "\${testif}" ]; then - initctl stop flimflam + initctl stop shill # \$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}') @@ -55,7 +54,7 @@ if [ "\$1" != "\${testif}" ]; then if [ -n "\${orig_mac}" ]; then nameif \$1 \${orig_mac} fi - initctl start flimflam + initctl start shill fi # Bring up the backchannel interface