summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-03-31 14:37:32 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-03-31 14:37:32 +0200
commitfd1b37f035ae38cf25a787e4ee4dab643ce5ee32 (patch)
treeff37834a20f462a3532d4cd7a351dc0bcf158a32
parent547ae5bba79daef982f9f243971e4cef681f5331 (diff)
downloadptxdist-fd1b37f035ae38cf25a787e4ee4dab643ce5ee32.tar.gz
ptxdist-fd1b37f035ae38cf25a787e4ee4dab643ce5ee32.tar.xz
ptxd_make_bootable: do nothing if no bootloader is selectedptxdist-2011.04.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--scripts/lib/ptxd_make_bootable.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_make_bootable.sh b/scripts/lib/ptxd_make_bootable.sh
index e53110af9..aae3b5233 100644
--- a/scripts/lib/ptxd_make_bootable.sh
+++ b/scripts/lib/ptxd_make_bootable.sh
@@ -97,8 +97,7 @@ ptxd_make_bootable() {
stage1="${ptxd_reply}"
ptxd_get_path ${PTXDIST_SYSROOT_TARGET}/usr/lib/grub/*/stage2 || return
stage2="${ptxd_reply}"
- fi
- if ptxd_get_ptxconf PTXCONF_BAREBOX > /dev/null; then
+ elif ptxd_get_ptxconf PTXCONF_BAREBOX > /dev/null; then
echo
echo "--------------------------------------"
echo "Making the image bootable with barebox"
@@ -108,6 +107,9 @@ ptxd_make_bootable() {
ptxd_make_x86_boot_barebox "${image}" "${sectors}" "${stage1}"
return
fi
+ else
+ # no bootloader to write
+ return 0
fi
ptxd_make_dd_bootloader "${image}" "${sectors}" "${stage1}" "${stage2}"
}