From b36c52784f22ff47a3df6acdf11145ca3b24e1e5 Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Wed, 31 Oct 2012 14:24:55 -0700 Subject: [PATCH] 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 Commit-Ready: Paul Stewart Tested-by: Paul Stewart --- mod_for_test_scripts/100setupTestingInterface | 4 ++-- mod_for_test_scripts/150setupVirtualWiFi | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100755 mod_for_test_scripts/150setupVirtualWiFi diff --git a/mod_for_test_scripts/100setupTestingInterface b/mod_for_test_scripts/100setupTestingInterface index 646b6b88c3..b2b86d4d2a 100755 --- a/mod_for_test_scripts/100setupTestingInterface +++ b/mod_for_test_scripts/100setupTestingInterface @@ -4,9 +4,9 @@ # Use of this source code is governed by a BSD-style license that can be # 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 # Prevent shill from taking control of the backchannel network device. diff --git a/mod_for_test_scripts/150setupVirtualWiFi b/mod_for_test_scripts/150setupVirtualWiFi deleted file mode 100755 index 3d9499a399..0000000000 --- a/mod_for_test_scripts/150setupVirtualWiFi +++ /dev/null @@ -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