cros_deploy: Run dlcservice_util in its default user
dlcservice_util enters a minijail already. So no need to explicitly run
it as chronos. Besides, it should not be run as 'chronos'. It should be
run as 'dlcservice' user.
BUG=chromium:1081495
TEST=cros deploy dummy-dlc
Change-Id: Id24b7c4e3b389cdbc9c3d3e4f1dbe0b6feab0faa
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2194893
Tested-by: Amin Hassani <ahassani@chromium.org>
Auto-Submit: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Andrew Lassalle <andrewlassalle@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
diff --git a/cli/deploy.py b/cli/deploy.py
index 613fbf2..7ef0ac0 100644
--- a/cli/deploy.py
+++ b/cli/deploy.py
@@ -997,8 +997,7 @@
dlc_id = pkg_attrs[_DLC_ID]
logging.notice('Uninstalling DLC image for %s', dlc_id)
- device.run(['sudo', '-u', 'chronos', 'dlcservice_util', '--uninstall',
- '--dlc_ids=%s' % dlc_id])
+ device.run(['dlcservice_util', '--uninstall', '--dlc_ids=%s' % dlc_id])
return True
else:
logging.debug('DLC_ID not found in package')
@@ -1012,7 +1011,7 @@
logging.debug('Uninstall DLC %s if it is installed.', dlc_id)
try:
- device.run(['dlcservice_util', '--dlc_ids=%s' % dlc_id, '--uninstall'])
+ device.run(['dlcservice_util', '--uninstall', '--dlc_ids=%s' % dlc_id])
except cros_build_lib.RunCommandError as e:
logging.info('Failed to uninstall DLC:%s. Continue anyway.',
e.result.error)