From ac85ab7db262290854b17651e202ba9c2fa7019e Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Mon, 23 Jul 2018 06:04:05 +0000
Subject: [PATCH] Older zfs boot blocks don't support symlinks. install the
 link to zfsloader as a hard link. While newer ones do, the whole point of the
 link was to transition to the new world order smoothly. A hard link is less
 flexible, but it works and will result in fewer bumps. Adjust UPDATING entry
 to match.

---
 UPDATING                      | 7 ++++---
 stand/i386/loader/Makefile    | 2 +-
 stand/sparc64/loader/Makefile | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/UPDATING b/UPDATING
index 61efdfba398..d2e856a59f2 100644
--- a/UPDATING
+++ b/UPDATING
@@ -34,9 +34,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 20180720:
 	zfsloader's functionality has now been folded into loader.
 	zfsloader is no longer necesasary once you've updated your
-	boot blocks. For a transition period, there will be a symlink
-	in place from zfsloader to loader to allow a smooth transition
-	until the boot blocks can be updated.
+	boot blocks. For a transition period, we will install a
+	hardlink for zfsloader to loader to allow a smooth transition
+	until the boot blocks can be updated (hard link because old
+	zfs boot blocks don't understand symlinks).
 
 20180719:
 	New uid:gid added, ntpd:ntpd (123:123).  Be sure to run mergemaster
diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile
index b5dd065f025..04064136183 100644
--- a/stand/i386/loader/Makefile
+++ b/stand/i386/loader/Makefile
@@ -65,7 +65,7 @@ ${LOADER}.bin: ${LOADER}.sym
 	strip -R .comment -R .note -o ${.TARGET} ${.ALLSRC}
 
 .if ${MK_ZFS} == "yes"
-SYMLINKS=	${BINDIR}/${LOADER} ${BINDIR}/zfs${LOADER}
+LINKS=		${BINDIR}/${LOADER} ${BINDIR}/zfs${LOADER}
 .endif
 FILES+=	${LOADER}
 # XXX INSTALLFLAGS_loader= -b
diff --git a/stand/sparc64/loader/Makefile b/stand/sparc64/loader/Makefile
index d0a5d5b8170..47052b74346 100644
--- a/stand/sparc64/loader/Makefile
+++ b/stand/sparc64/loader/Makefile
@@ -43,7 +43,7 @@ HELP_FILES=	${.CURDIR}/help.sparc64
 LDFLAGS+=	-static
 
 .if ${MK_ZFS} == "yes"
-SYMLINKS=	${BINDIR}/loader ${BINDIR}/zfsloader
+LINKS=		${BINDIR}/loader ${BINDIR}/zfsloader
 .endif
 
 # Open Firmware standalone support library
-- 
2.45.0