From df23c6db569d84cd13d009ff5e316393d2156b7b Mon Sep 17 00:00:00 2001 From: mukesh agrawal Date: Thu, 5 Apr 2012 17:23:33 -0700 Subject: [PATCH] mod_for_test_scripts: add backchannel interface support for shill To use a backchannel interface, we need to configure the connection manager to ignore that interface. shill uses a different syntax for that command-line option, because base's command-line parser doesn't support the option syntax flimflam uses. This CL adds code to rewrite the part of flimflam.conf that holds shill's configuration options. CQ-DEPEND=Ic2fdf49ec454995bf9378299e64378f957b9f26c BUG=chromium-os:23531 TEST=manual (see below) Manual testing: ran flimflam and shill on test images. Verified that the connection manager ran with the appropriate command line flags in both cases. Change-Id: I57481387e207bf1ad5138a9fce9921539eed080f Reviewed-on: https://gerrit.chromium.org/gerrit/19712 Reviewed-by: Paul Stewart Commit-Ready: mukesh agrawal Tested-by: mukesh agrawal --- mod_for_test_scripts/100setupTestingInterface | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod_for_test_scripts/100setupTestingInterface b/mod_for_test_scripts/100setupTestingInterface index 8c530ea5fa..cc3bb248ba 100755 --- a/mod_for_test_scripts/100setupTestingInterface +++ b/mod_for_test_scripts/100setupTestingInterface @@ -11,7 +11,9 @@ testif=eth_test # 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,flimflamd,flimflamd -I ${testif}," ${ORIG_CONF} > ${TEMP_CONF} +sed -e "s,flimflamd,flimflamd -I ${testif}," \ + -e "s,SHILL_TEST_ARGS=\"\",SHILL_TEST_ARGS=\"--device-black-list=${testif}\"," \ + ${ORIG_CONF} > ${TEMP_CONF} mv -f ${TEMP_CONF} ${ORIG_CONF} # Arrange to run dhclient on the backchannel device but without