| |
@@ -445,15 +445,15 @@
|
| |
sed -i 's|/dev/mapper/fedora-root|/dev/mapper/fedora--server-root|g; s|rd.lvm.lv=fedora/root|rd.lvm.lv=fedora-server/root|g' /tmp/fw/EFI/fedora/grubenv
|
| |
fi
|
| |
|
| |
+ if [ "$IOT_IMAGE" = "1" ]; then
|
| |
+ # dd doesnt support wildcards, echo to expand
|
| |
+ PREFIX=$(echo $OSTREE_PREFIX)
|
| |
+ else
|
| |
+ PREFIX=/tmp/root
|
| |
+ fi
|
| |
|
| |
# determine uboot and write to disk
|
| |
if [ "$TARGET" != "" ]; then
|
| |
- if [ "$IOT_IMAGE" = "1" ]; then
|
| |
- # dd doesnt support wildcards, echo to expand
|
| |
- PREFIX=$(echo $OSTREE_PREFIX)
|
| |
- else
|
| |
- PREFIX=/tmp/root
|
| |
- fi
|
| |
if [ "$TARGET" = "rpi2" ] || [ "$TARGET" = "rpi3" ] || [ "$TARGET" = "olpc_xo175" ]; then
|
| |
. "${BOARDDIR}/${TARGET}"
|
| |
elif [ -d "${PREFIX}/usr/share/uboot/${TARGET}" ]; then
|
| |
PREFIX was only set when a --target was specified. With an empty PREFIX
the following options would then affect the host system instead of the
arm image:
--norootpass
--selinux
--sysrq
--relabel
This patch set the PREFIX to /tmp/root if no --target is specified.