From e82e99e999db80f7633b80222a6098b6ab97ec1c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 24 Sep 2012 15:13:45 -0400 Subject: [PATCH] cgpt_shell: avoid bash This script gets run on the target, so we need to avoid bash. BUG=chromium-os:34715 TEST=build_image works Change-Id: Ib64036246149b8b98414e4434ed89a3a40c2f693 Reviewed-on: https://gerrit.chromium.org/gerrit/33911 Reviewed-by: Liam McLoughlin Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger --- build_library/cgpt_shell.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build_library/cgpt_shell.sh b/build_library/cgpt_shell.sh index 68298f113d..dedd0542aa 100644 --- a/build_library/cgpt_shell.sh +++ b/build_library/cgpt_shell.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -6,11 +6,12 @@ # This script is automatically generated by @SCRIPT_GENERATOR@ # Do not edit! -if ! type numsectors &>/dev/null; then - if [[ -f "/usr/sbin/chromeos-common.sh" ]]; then - . "/usr/sbin/chromeos-common.sh" +if ! type numsectors >/dev/null 2>&1; then + if [ -f "/usr/sbin/chromeos-common.sh" ]; then + . "/usr/sbin/chromeos-common.sh" else - die "Can't load chromeos-common.sh, dying!" + echo "Can't load chromeos-common.sh, dying!" 1>&2 + exit 1 fi fi locate_gpt @@ -22,13 +23,13 @@ create_image() { local dev=$1 local min_disk_size=$2 local block_size=$3 - if [[ -b "${dev}" ]]; then + if [ -b "${dev}" ]; then # Zap any old partitions (otherwise gpt complains). dd if=/dev/zero of="${dev}" conv=notrunc bs=512 count=32 dd if=/dev/zero of="${dev}" conv=notrunc bs=512 \ seek=$((${min_disk_size} - 1 - 33)) count=33 else - if [[ ! -e "${dev}" ]]; then + if [ ! -e "${dev}" ]; then dd if=/dev/zero of="${dev}" bs=${block_size} count=1 \ seek=$((${min_disk_size} - 1)) fi