git: 62f8e141920c - stable/13 - makefs: correct iso9660 Rock Ridge NM values

From: Ed Maste <>
Date: Mon, 10 Apr 2023 13:38:09 UTC
The branch stable/13 has been updated by emaste:


commit 62f8e141920c555f4a80038062ba8d0edc3b79c5
Author:     Ed Maste <>
AuthorDate: 2023-03-23 12:35:34 +0000
Commit:     Ed Maste <>
CommitDate: 2023-04-10 13:37:40 +0000

    makefs: correct iso9660 Rock Ridge NM values
    These are not actually used by makefs (yet), but ought to match the
    See RRIP 4.1.4 Description of the "NM" System Use Entry for details.
    PR:             203531
    Sponsored by:   The FreeBSD Foundation
    (cherry picked from commit c3ec19359e05c3b609e461896aa6ab4d6ad8121f)
 usr.sbin/makefs/cd9660/iso9660_rrip.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.h b/usr.sbin/makefs/cd9660/iso9660_rrip.h
index ef35405c62e6..72323ab695e1 100644
--- a/usr.sbin/makefs/cd9660/iso9660_rrip.h
+++ b/usr.sbin/makefs/cd9660/iso9660_rrip.h
@@ -60,9 +60,9 @@
 #define	 TF_EXPIRATION	   0x20
 #define	 TF_EFFECTIVE	   0x40
 #define	 TF_LONG_FORM	   0x80
-#define  NM_CONTINUE	   0x80
-#define	 NM_CURRENT	   0x100
-#define	 NM_PARENT	   0x200
+#define	 NM_CONTINUE	   0x01
+#define	 NM_CURRENT	   0x02
+#define	 NM_PARENT	   0x04
 #define	 SUSP_LOC_ENTRY	   0x01