From owner-svn-src-all@freebsd.org Mon Jul 23 06:04:07 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1CD11040159; Mon, 23 Jul 2018 06:04:06 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8E32095903; Mon, 23 Jul 2018 06:04:06 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 69CE918BAE; Mon, 23 Jul 2018 06:04:06 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6N6460O061391; Mon, 23 Jul 2018 06:04:06 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6N645YH061388; Mon, 23 Jul 2018 06:04:05 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807230604.w6N645YH061388@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 23 Jul 2018 06:04:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336626 - in head: . stand/i386/loader stand/sparc64/loader X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: . stand/i386/loader stand/sparc64/loader X-SVN-Commit-Revision: 336626 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2018 06:04:07 -0000 Author: imp Date: Mon Jul 23 06:04:05 2018 New Revision: 336626 URL: https://svnweb.freebsd.org/changeset/base/336626 Log: 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. Modified: head/UPDATING head/stand/i386/loader/Makefile head/stand/sparc64/loader/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Jul 22 23:41:40 2018 (r336625) +++ head/UPDATING Mon Jul 23 06:04:05 2018 (r336626) @@ -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 Modified: head/stand/i386/loader/Makefile ============================================================================== --- head/stand/i386/loader/Makefile Sun Jul 22 23:41:40 2018 (r336625) +++ head/stand/i386/loader/Makefile Mon Jul 23 06:04:05 2018 (r336626) @@ -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 Modified: head/stand/sparc64/loader/Makefile ============================================================================== --- head/stand/sparc64/loader/Makefile Sun Jul 22 23:41:40 2018 (r336625) +++ head/stand/sparc64/loader/Makefile Mon Jul 23 06:04:05 2018 (r336626) @@ -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