tree 74752c753159488d2910f16eb56523e9a8c7b1ba
parent 85da00b79a9a12190cc0edf5a5f72aff05f050ae
author Micah Morton <mortonm@chromium.org> 1528728121 +0000
committer chrome-bot <chrome-bot@chromium.org> 1528749879 -0700

Revert "shill: Pass RPC identifiers for l2tpipsec_vpn on command line"

This reverts commit 09c1ef83b3b862202536d1a9142a0f613e176c38.

Reason for revert: Breaks parts of shill that spawn pppd directly through ExternalTask. We should instead be setting the command line vars here https://cs.corp.google.com/chromeos_public/src/aosp/system/connectivity/shill/vpn/l2tp_ipsec_driver.cc?rcl=85da00b79a9a12190cc0edf5a5f72aff05f050ae&l=237 for the specific case of spawning l2tpipsec_vpn through ExternalTask.

Original change's description:
> shill: Pass RPC identifiers for l2tpipsec_vpn on command line
>
> This CL is in preparation to run the shill process tree as a non-root
> user.
>
> These args are already passed to the l2tpipsec_vpn program through the
> use of environment variables. Pass them on the command line as well, in
> order to enable landing the corresponding changes in l2tpipsec_vpn that
> set these values from the command line args rather than relying on them
> being passed as environment vars. Once we start spawning l2tpipsec_vpn
> through ExternalTask::StartInMinijail instead of ExternalTask::Start, we
> can remove this change.
>
> CQ-DEPEND=CL:1039878
> BUG=chromium:649417
> TEST=tested as part of larger sandbox shill debug CL
>
> Change-Id: Icf3f94dfe48fd7ec85941ba317b2f19e571c2317
> Reviewed-on: https://chromium-review.googlesource.com/1039882
> Commit-Ready: Micah Morton <mortonm@chromium.org>
> Tested-by: Micah Morton <mortonm@chromium.org>
> Reviewed-by: Micah Morton <mortonm@chromium.org>

TBR=benchan@chromium.org,ejcaruso@chromium.org,cernekee@chromium.org,mortonm@chromium.org,chromiumos-cl-exonerator@appspot.gserviceaccount.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: chromium:649417
Change-Id: I4b21ba7542e7a08559a5f337b6912921130ef5a0
Reviewed-on: https://chromium-review.googlesource.com/1095394
Commit-Ready: Micah Morton <mortonm@chromium.org>
Tested-by: Micah Morton <mortonm@chromium.org>
Reviewed-by: Micah Morton <mortonm@chromium.org>