make_factory_package.sh: fix --diskimg for ARM images

Legacy boot loader like syslinux is only for x86 platforms.
We should ignore the configuration files if they don't exist.

BUG=chromium-os:21887
TEST=./make_factory_package --diskimg OUTPUT \
     --release PATH_TO_ARM_IMAGE \
     --factory PATH_TO_ARM_IMAGE \
     --hwid none  # success
     # do the same for x86 builds, mount ESP (#12)
     # and found 'sda3' in root.A.cfg

Change-Id: I53a8b418045465a69d700298b73793d60187f31a
Reviewed-on: http://gerrit.chromium.org/gerrit/10385
Reviewed-by: Tammo Spalink <tammo@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Nick Sanders <nsanders@chromium.org>
This commit is contained in:
Hung-Te Lin 2011-10-20 09:56:29 +08:00
parent c9dfcaf480
commit 4c90853861

View File

@ -469,16 +469,19 @@ generate_img() {
image_add_temp "$tmpesp"
image_mount_partition "${outdev}" 12 "$tmpesp" "rw"
# Edit boot device default for legacy.
# Support both vboot and regular boot.
sudo sed -i "s/chromeos-usb.A/chromeos-hd.A/" \
# Edit boot device default for legacy boot loaders, if available.
if [ -d "${tmpesp}/syslinux" ]; then
# Support both vboot and regular boot.
sudo sed -i "s/chromeos-usb.A/chromeos-hd.A/" \
"${tmpesp}"/syslinux/default.cfg
sudo sed -i "s/chromeos-vusb.A/chromeos-vhd.A/" \
sudo sed -i "s/chromeos-vusb.A/chromeos-vhd.A/" \
"${tmpesp}"/syslinux/default.cfg
# Edit root fs default for legacy
# Somewhat safe as ARM does not support syslinux, I believe.
sudo sed -i "s'HDROOTA'/dev/sda3'g" "${tmpesp}"/syslinux/root.A.cfg
# Edit root fs default for legacy.
# Since legacy loader currently exists only on x86 platforms, we can assume
# the rootfs is always sda3.
sudo sed -i "s'HDROOTA'/dev/sda3'g" \
"${tmpesp}"/syslinux/root.A.cfg
fi
image_umount_partition "$tmpesp"
echo "Generated Image at $outdev."