commit 3dfd64314d5b4f3614dd0df5bce3e0e2be55aa77
author Lonnie Liu <lonliu@google.com> Fri May 03 21:01:53 2019 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed May 08 19:35:41 2019 -0700
tree 470bafa0494c4661b5643aec6dc5e83458c040d2
parent df4e707b693801e11d8ac21b8cd21b717cb34799

add back non-losetup partition script support

BUG=b:131855135
TEST=build lasilla_ground with new scripts in google3

Change-Id: Idbcb1132ddf3eecb19706d8c29cac9555edce28f
Reviewed-on: https://chromium-review.googlesource.com/1592730
Commit-Ready: Lonnie Liu <lonliu@google.com>
Tested-by: Lonnie Liu <lonliu@google.com>
Reviewed-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: Lonnie Liu <lonliu@google.com>

build_library/disk_layout_util.sh

diff --git a/build_library/disk_layout_util.sh b/build_library/disk_layout_util.sh
index 9c97c8d..e71578d 100644
--- a/build_library/disk_layout_util.sh
+++ b/build_library/disk_layout_util.sh
@@ -225,17 +225,40 @@
     echo
     ret=1
   fi
-  echo "Usage: $0 [image] [part]"
+  echo "Usage: $0 [-h|--help] [--nolosetup] [image] [part]"
   echo "Example: $0 chromiumos_image.bin"
   exit ${ret}
 }
 
-TARGET=${1:-}
-PART=${2:-}
+USE_LOSETUP=yes
+TARGET=""
+PART=""
+ARG_INDEX=0
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -h|--help)
+      usage
+      ;;
+    --nolosetup)
+      USE_LOSETUP=no
+      shift
+      ;;
+    *)
+      if [[ ${ARG_INDEX} -eq 0 ]]; then
+        TARGET="${1}"
+      elif [[ ${ARG_INDEX} -eq 1 ]]; then
+        PART="${1}"
+      else
+        usage "too many arguments"
+      fi
+      ARG_INDEX=$((ARG_INDEX+1))
+      shift
+      ;;
+  esac
+done
+
 case ${TARGET} in
--h|--help)
-  usage
-  ;;
 "")
   for TARGET in chromiumos_{,base_}image.bin ""; do
     if [[ -e ${TARGET} ]]; then
@@ -266,7 +289,9 @@
   fi
 }
 trap cleanup EXIT
-LOOPDEV=$(sudo losetup -P -f --show "${TARGET}") || exit 1
+if [[ "${USE_LOSETUP}" == yes ]]; then
+  LOOPDEV=$(sudo losetup -P -f --show "${TARGET}") || exit 1
+fi
 
 EOF
     fi
@@ -292,11 +317,19 @@
     done
 
     cat <<EOF >> "${unpack}"
-sudo dd if="\${LOOPDEV}p${part}" of="${file}"
+if [[ -n "\${LOOPDEV}" ]]; then
+  sudo dd if="\${LOOPDEV}p${part}" of="${file}"
+else
+  dd if=${target} of="${file}" ${dd_args} skip=${start}
+fi
 ln -sfT ${file} "${file}_${label}"
 EOF
     cat <<EOF >> "${pack}"
-sudo dd if="${file}" of="\${LOOPDEV}p${part}"
+if [[ -n "\${LOOPDEV}" ]]; then
+  sudo dd if="${file}" of="\${LOOPDEV}p${part}"
+else
+  dd if="${file}" of=${target} ${dd_args} seek=${start} conv=notrunc
+fi
 EOF
 
     if [[ ${size} -gt 1 ]]; then