shill: --use-flimflam-dirs options switches all shill directories to flimflam's.
Rename the existing --use-flimflam-profiles option to
--use-flimflam-dirs and include the run directory in the set of
directories that get switched. This allows easier command-line switch
between flimflam and shill.
BUG=chromium-os:29630
TEST=tested on device:
stop flimflam
shill --foreground --use-flimflam-dirs
checked that /var/run/flimflam/resolv.conf gets updated
Change-Id: I34d4d4be21cb30f8de8f14538864d40942126b27
Reviewed-on: https://gerrit.chromium.org/gerrit/20451
Commit-Ready: Darin Petkov <petkov@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>
diff --git a/shill_config.h b/shill_config.h
index 67d6487..861a70e 100644
--- a/shill_config.h
+++ b/shill_config.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -16,7 +16,7 @@
Config();
virtual ~Config();
- void UseFlimflamStorageDirs() { use_flimflam_ = true; }
+ void UseFlimflamDirs() { use_flimflam_ = true; }
virtual std::string GetRunDirectory();
virtual std::string GetStorageDirectory();
@@ -26,6 +26,7 @@
static const char kDefaultRunDirectory[];
static const char kDefaultStorageDirectory[];
static const char kDefaultUserStorageFormat[];
+ static const char kFlimflamRunDirectory[];
static const char kFlimflamStorageDirectory[];
static const char kFlimflamUserStorageFormat[];