aboutsummaryrefslogtreecommitdiff
path: root/release/sparc64/mkisoimages.sh
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2013-07-26 14:23:25 +0000
committerMarius Strobl <marius@FreeBSD.org>2013-07-26 14:23:25 +0000
commitbd376402de5e737818448a862161d3affb29b48e (patch)
tree5944e22097e2dfbab8f29c402ea5521b4a201c89 /release/sparc64/mkisoimages.sh
parent2e17284732170005a2d584726143d31d6fabef95 (diff)
downloadsrc-bd376402de5e737818448a862161d3affb29b48e.tar.gz
src-bd376402de5e737818448a862161d3affb29b48e.zip
- Once we have shifted arguments thrice, base-bits-dir is $1 rather than $4.
Introduce $BASEBITSDIR for clarity and in order to avoid repeating this mistake in the future. Fixing this ensures that we pick up the newly built boot code and loader native to the target, which is especially relevant when cross-building release images. - It is pointless to specify an endianess for ISO 9660 images so strip that. MFC after: 3 days
Notes
Notes: svn path=/head/; revision=253676
Diffstat (limited to 'release/sparc64/mkisoimages.sh')
-rw-r--r--release/sparc64/mkisoimages.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/release/sparc64/mkisoimages.sh b/release/sparc64/mkisoimages.sh
index 82cadab93a92..9c60cb23704e 100644
--- a/release/sparc64/mkisoimages.sh
+++ b/release/sparc64/mkisoimages.sh
@@ -32,26 +32,28 @@ case $1 in
esac
LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
NAME=$1; shift
+BASEBITSDIR=$1
# Create an ISO image
publisher="The FreeBSD Project. http://www.FreeBSD.org/"
-echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
-makefs -t cd9660 -B be -o rockridge -o label="$LABEL" -o publisher="$publisher" ${NAME}.tmp $*
-rm $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "${BASEBITSDIR}/etc/fstab"
+makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" ${NAME}.tmp $*
+rm "${BASEBITSDIR}/etc/fstab"
if [ "x$BOPT" != "x-b" ]; then
mv ${NAME}.tmp ${NAME}
exit 0
fi
+
TMPIMGDIR=`mktemp -d /tmp/bootfs.XXXXXXXX` || exit 1
BOOTFSDIR="${TMPIMGDIR}/bootfs"
BOOTFSIMG="${TMPIMGDIR}/bootfs.img"
# Create a boot filesystem
mkdir -p "${BOOTFSDIR}/boot"
-cp $4/boot/loader "${BOOTFSDIR}/boot"
+cp -p "${BASEBITSDIR}/boot/loader" "${BOOTFSDIR}/boot"
makefs -t ffs -B be -M 512k "${BOOTFSIMG}" "${BOOTFSDIR}"
-dd if=$4/boot/boot1 of="${BOOTFSIMG}" bs=512 conv=notrunc,sync
+dd if="${BASEBITSDIR}/boot/boot1" of="${BOOTFSIMG}" bs=512 conv=notrunc,sync
# Create a boot ISO image
: ${CYLSIZE:=640}