git: 4d7174b1d91f - main - release: Fix powerpc boot block uudecoding
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 13 Apr 2024 00:52:36 UTC
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=4d7174b1d91ff3651ef78987d93989a40a4facd2
commit 4d7174b1d91ff3651ef78987d93989a40a4facd2
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-04-13 00:50:15 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-04-13 00:52:28 +0000
release: Fix powerpc boot block uudecoding
Confusingly, uuencode writes to stdout by default, but uudecode does not.
Fixes: 6c3e01bf8578 "release: Randomize powerpc boot block file name"
MFC after: 3 days
---
release/powerpc/mkisoimages.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/release/powerpc/mkisoimages.sh b/release/powerpc/mkisoimages.sh
index e030ee41691c..ba7c32f87bee 100644
--- a/release/powerpc/mkisoimages.sh
+++ b/release/powerpc/mkisoimages.sh
@@ -70,7 +70,7 @@ if [ -n "$bootable" ]; then
BOOTBLOCK=$(mktemp /tmp/hfs-boot-block.XXXXXX)
# Apple boot code
- uudecode "`dirname "$0"`/hfs-boot.bz2.uu" | bunzip2 > $BOOTBLOCK
+ uudecode -p "`dirname "$0"`/hfs-boot.bz2.uu" | bunzip2 > $BOOTBLOCK
OFFSET=$(hd $BOOTBLOCK | grep 'Loader START' | cut -f 1 -d ' ')
OFFSET=0x$(echo 0x$OFFSET | awk '{printf("%x\n",$1/512);}')
dd if="$BASEBITSDIR/boot/loader" of=$BOOTBLOCK seek=$OFFSET conv=notrunc