mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 14:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

mod_for_test_scripts: add backchannel interface support for shill

Browse Source 
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 <pstew@chromium.org>
Commit-Ready: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>
This commit is contained in:
mukesh agrawal 2012-04-05 17:23:33 -07:00 committed by Gerrit
parent fbc6ca69fd
commit df23c6db56
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod_for_test_scripts/100setupTestingInterface
View File

@ -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