CHROMIUMOS: Add virtual WiFi devices to shill.conf

Collapse the modifications done in 150setupVirtualWiFi into
100setupTestingInterface.

BUG=chromium-os:35909
TEST=Run run script manually by setting ROOT_FS_DIR

Change-Id: I817ef7fcd30ba7c8e9f0883547124ab314101b5f
Reviewed-on: https://gerrit.chromium.org/gerrit/37057
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 14:24:55 -07:00 committed by Gerrit
parent 544477a08f
commit b36c52784f
2 changed files with 2 additions and 13 deletions

View File

@ -4,9 +4,9 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
echo "Configuring for backchannel network device" echo "Configuring for backchannel and test network devices"
testif=eth_test testif=eth_test,wlan1,wlan2,managed0,managed1
modemif=pseudomodem0p modemif=pseudomodem0p
# Prevent shill from taking control of the backchannel network device. # Prevent shill from taking control of the backchannel network device.

View File

@ -1,11 +0,0 @@
#!/bin/bash
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
echo "Configuring for virtual WiFi devices"
# Prevent flimflam from taking control of AP interfaces
sed -i "s/flimflamd/flimflamd -I wlan1 -I wlan2 -I managed0 -I managed1/" \
${ROOT_FS_DIR}/etc/init/flimflam.conf