diff options
| -rw-r--r-- | UPDATING | 7 | ||||
| -rw-r--r-- | stand/i386/loader/Makefile | 2 | ||||
| -rw-r--r-- | stand/sparc64/loader/Makefile | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/UPDATING b/UPDATING index 61efdfba398fb..d2e856a59f232 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 b5dd065f025b1..0406413618383 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 d0a5d5b817066..47052b743463a 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 |