commit 1dd47af6975ef0523e2f97f4aeda65b6a3049211
author Mike Frysinger <vapier@chromium.org> Wed Jun 16 20:27:39 2021 -0400
committer Commit Bot <commit-bot@chromium.org> Sat Jun 19 15:07:36 2021 +0000
tree f919d4af2dcc79cb82a9b21603e0b870599e12bf
parent e604f960d1f65d2b5329f002fa4a9120a7c33270

make_chroot: drop --delete logic

cros_sdk doesn't use this anymore, and no one else calls this script.
Drop all the --replace & --delete logic.

BUG=b:191307774
TEST=`cros_sdk --delete` works

Change-Id: Ibb1a75077e737000620e9d1bd75d31b0b712a21a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/2971203
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

sdk_lib/make_chroot.sh

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 2751756..d2baba1 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -36,8 +36,6 @@
 DEFINE_string chroot "$DEFAULT_CHROOT_DIR" \
   "Destination dir for the chroot environment."
 DEFINE_boolean usepkg $FLAGS_TRUE "Use binary packages to bootstrap."
-DEFINE_boolean delete $FLAGS_FALSE "Delete an existing chroot."
-DEFINE_boolean replace $FLAGS_FALSE "Overwrite existing chroot, if any."
 DEFINE_integer jobs -1 "How many packages to build in parallel at maximum."
 DEFINE_string stage3_path "" \
   "Use the stage3 located on this path."
@@ -61,9 +59,7 @@
 # TODO: replace shflags with something less error-prone, or contribute a fix.
 switch_to_strict_mode
 
-[[ "${FLAGS_delete}" == "${FLAGS_FALSE}" ]] && \
-  [[ -z "${FLAGS_cache_dir}" ]] && \
-  die "--cache_dir is required"
+[[ -z "${FLAGS_cache_dir}" ]] && die "--cache_dir is required"
 
 . "${SCRIPT_ROOT}"/sdk_lib/make_conf_util.sh
 
@@ -120,26 +116,6 @@
     chroot "${FLAGS_chroot}" "$@"
 }
 
-cleanup() {
-  # Clean up mounts
-  safe_umount_tree "${FLAGS_chroot}"
-
-  # Destroy LVM loopback setup if we can find a VG associated with our path.
-  local chroot_img="${FLAGS_chroot}.img"
-  [[ -f "$chroot_img" ]] || return 0
-
-  local chroot_dev=$(losetup -j "$chroot_img" | cut -f1 -d:)
-  local chroot_vg=$(find_vg_name "$FLAGS_chroot" "$chroot_dev")
-  if [ -n "$chroot_vg" ] && vgs "$chroot_vg" >&/dev/null; then
-    info "Removing VG $chroot_vg."
-    vgremove -f "$chroot_vg" --noudevsync
-  fi
-  if [ -n "$chroot_dev" ]; then
-    info "Detaching $chroot_dev."
-    losetup -d "$chroot_dev"
-  fi
-}
-
 # Appends stdin to the given file name as the sudo user.
 #
 # $1 - The output file name.
@@ -148,23 +124,6 @@
   chown ${SUDO_UID}:${SUDO_GID} "$1"
 }
 
-delete_existing() {
-  # Delete old chroot dir.
-  local chroot_img="${FLAGS_chroot}.img"
-  if [[ ! -e "$FLAGS_chroot" && ! -f "$chroot_img" ]]; then
-    return
-  fi
-  info "Cleaning up old mount points and loopback device..."
-  cleanup
-  info "Deleting $FLAGS_chroot..."
-  rm -rf "$FLAGS_chroot"
-  if [[ -f "$chroot_img" ]]; then
-    info "Deleting $chroot_img..."
-    rm -f "$chroot_img"
-  fi
-  info "Done."
-}
-
 init_users () {
    info "Set timezone..."
    # date +%Z has trouble with daylight time, so use host's info.
@@ -462,13 +421,6 @@
   fi
 }
 
-# Handle deleting an existing environment.
-if [[ $FLAGS_delete  -eq $FLAGS_TRUE || \
-  $FLAGS_replace -eq $FLAGS_TRUE ]]; then
-  delete_existing
-  [[ $FLAGS_delete -eq $FLAGS_TRUE ]] && exit 0
-fi
-
 CHROOT_TRUNK="${CHROOT_TRUNK_DIR}"
 PORTAGE="${SRC_ROOT}/third_party/portage"
 OVERLAY="${SRC_ROOT}/third_party/chromiumos-overlay"