commit ad3b200256d0525aa214adff967f76f0ca526551
author Mike Frysinger <vapier@chromium.org> Wed Aug 21 23:35:59 2019 -0400
committer Mike Frysinger <vapier@chromium.org> Mon Sep 02 06:24:49 2019 +0000
tree 1c85c509e3a64f246d7241ee3a6666243212a220
parent 8449a33072f182e73f99222c320086654bc893fd

common.sh: remove au-generator.zip support

We dropped au-generator.zip building a while back.  Clean up some
code in common.sh that supported that.

BUG=chromium:999596
TEST=CQ passes

Change-Id: I7807f13f576dfe71af323e38059b9f6079fd0904
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/1763881
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>

common.sh

diff --git a/common.sh b/common.sh
index 70bd4b4..cb1f2d1 100644
--- a/common.sh
+++ b/common.sh
@@ -666,17 +666,6 @@
   $([[ ${UID:-$(id -u)} != 0 ]] && echo sudo) umount "$@"
 }
 
-# Run a command with sudo in a way that still preferentially uses files
-# from au-generator.zip, but still finds things in /sbin and /usr/sbin when
-# not using au-generator.zip.
-au_generator_sudo() {
-  # When searching for env, the unmodified path is used and env is potentially
-  # found somewhere out in the system. env itself sees the modified PATH
-  # and will find the command where we're telling it to. Running the command
-  # directly without env will escape our constructed PATH.
-  sudo -E PATH="${PATH}:/sbin:/usr/sbin" env "$@"
-}
-
 # Setup a loopback device for a file and scan for partitions, with retries.
 #
 # $1 - The file to back the new loopback device.
@@ -684,11 +673,11 @@
 loopback_partscan() {
   local lb_dev image="$1"
   shift
-  lb_dev=$(au_generator_sudo losetup --show -f "$@" "${image}")
+  lb_dev=$(sudo losetup --show -f "$@" "${image}")
   # Ignore problems deleting existing partitions. There shouldn't be any
   # which will upset partx, but that's actually ok.
-  au_generator_sudo partx -d "${lb_dev}" 2>/dev/null || true
-  au_generator_sudo partx -a "${lb_dev}"
+  sudo partx -d "${lb_dev}" 2>/dev/null || true
+  sudo partx -a "${lb_dev}"
 
   echo "${lb_dev}"
 }
@@ -701,14 +690,14 @@
   # Retry the deletes before we detach.  crbug.com/469259
   local i
   for (( i = 0; i < 10; i++ )); do
-    if au_generator_sudo partx -d "$1"; then
+    if sudo partx -d "$1"; then
       break
     fi
     warn "Sleeping & retrying ..."
     sync
     sleep 1
   done
-  au_generator_sudo losetup --detach "$@"
+  sudo losetup --detach "$@"
 }
 
 # Sets up symlinks for the developer root. It is necessary to symlink