svn commit: r264937 - stable/9/usr.sbin/makefs/cd9660

[Marius Strobl]

Author: marius
Date: Fri Apr 25 21:20:28 2014
New Revision: 264937
URL: http://svnweb.freebsd.org/changeset/base/264937

Log:
  MFC: r260041
  
  Record the IEEE P1282 Rock Ridge version 1.12 POSIX File Serial Number,
  i. e. the POSIX:5.6.1 st_ino field, which can be used to detect hard links
  in the file system. This is also the default in mkisofs(8) and according to
  its man page, no system only being able to cope with Rock Ridge version 1.10
  is known to exist.
  
  PR:		185138
  Submitted by:	Kurt Lidl

Modified:
  stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.c
  stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.h
Directory Properties:
  stable/9/usr.sbin/makefs/   (props changed)

Modified: stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.c
==============================================================================
--- stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.c	Fri Apr 25 21:20:22 2014	(r264936)
+++ stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.c	Fri Apr 25 21:20:28 2014	(r264937)
@@ -634,7 +634,7 @@ cd9660_createSL(cd9660node *node)
 int
 cd9660node_rrip_px(struct ISO_SUSP_ATTRIBUTES *v, fsnode *pxinfo)
 {
-	v->attr.rr_entry.PX.h.length[0] = 36;
+	v->attr.rr_entry.PX.h.length[0] = 44;
 	v->attr.rr_entry.PX.h.version[0] = 1;
 	cd9660_bothendian_dword(pxinfo->inode->st.st_mode,
 	    v->attr.rr_entry.PX.mode);
@@ -644,8 +644,9 @@ cd9660node_rrip_px(struct ISO_SUSP_ATTRI
 	    v->attr.rr_entry.PX.uid);
 	cd9660_bothendian_dword(pxinfo->inode->st.st_gid,
 	    v->attr.rr_entry.PX.gid);
+	cd9660_bothendian_dword(pxinfo->inode->st.st_ino,
+	    v->attr.rr_entry.PX.serial);
 
-	/* Ignoring the serial number for now */
 	return 1;
 }
 

Modified: stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.h
==============================================================================
--- stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.h	Fri Apr 25 21:20:22 2014	(r264936)
+++ stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.h	Fri Apr 25 21:20:28 2014	(r264937)
@@ -103,7 +103,7 @@ typedef struct {
 	u_char links		[ISODCL(13,20)];
 	u_char uid		[ISODCL(21,28)];
 	u_char gid		[ISODCL(29,36)];
-	u_char serial		[ISODCL(37,44)];/* Not used */
+	u_char serial		[ISODCL(37,44)];
 } ISO_RRIP_PX;
 
 typedef struct {