installer: Remove --device-id.
Since the device_id is now a unique id that is generated on every boot,
manually override device_id doesn't work anymore. We may replace this by
a "device label" in the future.
BUG=chromium:711200
TEST=make test
Change-Id: I53c904652d770afb085ade00a67bfd35c3fe5c57
Reviewed-on: https://chromium-review.googlesource.com/536557
Commit-Ready: Pi-Hsun Shih <pihsun@chromium.org>
Tested-by: Pi-Hsun Shih <pihsun@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
diff --git a/py/toolkit/installer.py b/py/toolkit/installer.py
index 34786d4..18f3f4a 100755
--- a/py/toolkit/installer.py
+++ b/py/toolkit/installer.py
@@ -23,12 +23,11 @@
import time
import factory_common # pylint: disable=unused-import
-from cros.factory.test import event_log
from cros.factory.test.env import paths
from cros.factory.tools import install_symlinks
from cros.factory.utils import file_utils
-from cros.factory.utils import sys_utils
from cros.factory.utils.process_utils import Spawn
+from cros.factory.utils import sys_utils
INSTALLER_PATH = 'usr/local/factory/py/toolkit/installer.py'
@@ -111,7 +110,7 @@
_sudo = True
def __init__(self, src, dest, no_enable, enable_presenter,
- enable_device, non_cros=False, device_id=None, system_root='/',
+ enable_device, non_cros=False, system_root='/',
apps=None):
self._src = src
self._system_root = system_root
@@ -158,7 +157,6 @@
self._enable_device = enable_device
self._device_tag_file = os.path.join(self._usr_local_dest, 'factory',
'init', 'run_goofy_device')
- self._device_id = device_id
self._apps = apps
if not os.path.exists(self._usr_local_src):
@@ -203,11 +201,6 @@
print '*** Removing %s enabled tag...' % name
Spawn(['rm', '-f', path], sudo=True, log=True, check_call=True)
- def _SetDeviceID(self):
- if self._device_id is not None:
- file_utils.WriteFile(os.path.join(event_log.DEVICE_ID_PATH),
- self._device_id)
-
def _EnableApp(self, app, enabled):
"""Enable / disable @app.
@@ -315,7 +308,6 @@
self._enable_presenter)
self._SetTagFile('device', self._device_tag_file, self._enable_device)
- self._SetDeviceID()
self._EnableApps()
print '*** Installation completed.'
@@ -453,9 +445,6 @@
action='store_false', help=argparse.SUPPRESS)
parser.set_defaults(enable_device=False)
- parser.add_argument('--device-id', dest='device_id', type=str, default=None,
- help='Set device ID for this device')
-
parser.add_argument('--exe-path', dest='exe_path',
nargs='?', default=None,
help='Current self-extracting archive pathname')
@@ -524,7 +513,6 @@
src=src_root, dest=dest, no_enable=args.no_enable,
enable_presenter=args.enable_presenter,
enable_device=args.enable_device, non_cros=args.non_cros,
- device_id=args.device_id,
apps=args.apps)
print installer.WarningMessage(args.dest if patch_test_image else None)