Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jun 2025 18:22:40 GMT
From:      Colin Percival <cperciva@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: be7272d78a76 - main - release: Don't fail if we can't hardlink a VM img
Message-ID:  <202506201822.55KIMeFM067675@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=be7272d78a76c7a897b530538b905385f1b09f88

commit be7272d78a76c7a897b530538b905385f1b09f88
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-06-20 18:19:59 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-06-20 18:22:34 +0000

    release: Don't fail if we can't hardlink a VM img
    
    For compatibility with code written before we added ZFS images, we
    create compatibility hardlinks from non-FS-labelled image filenames
    to the ${VMFS} (typically UFS) images.  This fails if the image
    didn't build, and can take down the entire release build if we're
    not careful.
    
    Fixes:  611c1457ff32 ("release: Add set -e to abort upon failure")
---
 release/Makefile.vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/Makefile.vm b/release/Makefile.vm
index 975a8e970ade..8375650cd9aa 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -156,7 +156,7 @@ CLOUDTARGETS+=	cw-${_CW:tl}-${_FMT}
 CLEANFILES+=	${_CW:tl}.${_FMT}
 ${_CW:tu}${_FMT:tu}IMAGE=	${_CW:tl}.${_FMT}
 cw-${_CW:tl}-${_FMT}: cw-${_CW:tl}-${VMFS}-${_FMT}
-	ln -f ${${_CW:tu}${VMFS:tu}${_FMT:tu}IMAGE} ${${_CW:tu}${_FMT:tu}IMAGE}
+	ln -f ${${_CW:tu}${VMFS:tu}${_FMT:tu}IMAGE} ${${_CW:tu}${_FMT:tu}IMAGE} || true
 .  endfor
 
 # Targets without a disk format listed are the first disk format on the list



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506201822.55KIMeFM067675>