mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-29 14:31:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

"flimflam" init file is now named "shill"

Browse Source 
BUG=chromium-os:35909
TEST=None

Change-Id: I055068435812043eb1c31fd8a6fd2ca0b5b8017f
Reviewed-on: https://gerrit.chromium.org/gerrit/37022
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Ready: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
This commit is contained in:
Paul Stewart 2012-10-31 09:04:41 -07:00 committed by Gerrit
parent 76764885b9
commit 544477a08f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod_for_test_scripts/100setupTestingInterface
View File

@ -9,11 +9,10 @@ echo "Configuring for backchannel network device"
testif=eth_test testif=eth_test
modemif=pseudomodem0p modemif=pseudomodem0p
# Prevent flimflam from taking control of the backchannel network device. # Prevent shill from taking control of the backchannel network device.
ORIG_CONF=${ROOT_FS_DIR}/etc/init/flimflam.conf ORIG_CONF=${ROOT_FS_DIR}/etc/init/shill.conf
TEMP_CONF=${ORIG_CONF}.tmp TEMP_CONF=${ORIG_CONF}.tmp
sed -e "s,flimflamd,flimflamd -I ${testif} -I ${modemif}," \ sed -e "s@SHILL_TEST_ARGS=\"\"@SHILL_TEST_ARGS=\"--device-black-list=${testif},${modemif}\"@" \
-e "s@SHILL_TEST_ARGS=\"\"@SHILL_TEST_ARGS=\"--device-black-list=${testif},${modemif}\"@" \
${ORIG_CONF} > ${TEMP_CONF} ${ORIG_CONF} > ${TEMP_CONF}
mv -f ${TEMP_CONF} ${ORIG_CONF} mv -f ${TEMP_CONF} ${ORIG_CONF}
@ -42,7 +41,7 @@ if [ -f /var/run/dhclient-\${testif}.pid ]; then
fi fi
if [ "\$1" != "\${testif}" ]; then if [ "\$1" != "\${testif}" ]; then
initctl stop flimflam initctl stop shill
# \$1 is the current name of the backchannel device. Swap it with testif. # \$1 is the current name of the backchannel device. Swap it with testif.
if ifconfig \${testif} > /dev/null 2>&1; then if ifconfig \${testif} > /dev/null 2>&1; then
orig_mac=\$(ifconfig \${testif} | awk '/HWaddr/ {print \$5}') orig_mac=\$(ifconfig \${testif} | awk '/HWaddr/ {print \$5}')
@ -55,7 +54,7 @@ if [ "\$1" != "\${testif}" ]; then
if [ -n "\${orig_mac}" ]; then if [ -n "\${orig_mac}" ]; then
nameif \$1 \${orig_mac} nameif \$1 \${orig_mac}
fi fi
initctl start flimflam initctl start shill
fi fi
# Bring up the backchannel interface # Bring up the backchannel interface