Module Name:    src
Committed By:   christos
Date:           Tue Apr 23 22:00:37 UTC 2024

Modified Files:
        src/distrib/vax/floppy: Makefile

Log Message:
VAX boot.fs: Fix owner/group/permissions for VAX's boot.fs (Jan-Benedict Glaw)

(Initial patch from Christos Zoulas.)  Don't create an archive based on local
permission bits and owner/group. Instead, feed a small manifest into `pax`
and let it to its work.

  NB: Don't also feed in an entry for the current directory ".", as `pax` will
then archive all files in the current directory, in `readdir()` order.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/vax/floppy/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/vax/floppy/Makefile
diff -u src/distrib/vax/floppy/Makefile:1.14 src/distrib/vax/floppy/Makefile:1.15
--- src/distrib/vax/floppy/Makefile:1.14	Fri Feb 10 22:07:06 2017
+++ src/distrib/vax/floppy/Makefile	Tue Apr 23 18:00:37 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2017/02/11 03:07:06 christos Exp $
+#	$NetBSD: Makefile,v 1.15 2024/04/23 22:00:37 christos Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,7 +29,10 @@ boot.vax: ${DESTDIR}/usr/mdec/boot
 
 ${IMAGE}: ${IMAGEDEPENDS}
 	cat ${XXBOOT} > ${IMAGE}.tmp
-	${TOOL_PAX} ${PAX_TIMESTAMP} -O -w -x ustar boot.vax netbsd.gz | dd of=${IMAGE}.tmp seek=16
+	(echo "./boot.vax type=file uname=root gname=wheel mode=0755"; \
+	 echo "./netbsd.gz type=file uname=root gname=wheel mode=0644") | \
+		${TOOL_PAX} ${PAX_TIMESTAMP} -O -w -x ustar -M | \
+		dd of=${IMAGE}.tmp seek=16
 	dd if=${IMAGE}.tmp of=${IMAGE} bs=${IMAGESIZE} conv=sync
 
 release: check_RELEASEDIR .WAIT ${IMAGE}

Reply via email to