GNU bug report logs -
#27265
[PATCH] file-systems: Use creation time if modification time is unset for ISO9660.
Previous Next
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your message dated Wed, 7 Jun 2017 08:35:34 +0200
with message-id <20170607083534.0444685a <at> scratchpost.org>
and subject line Re: bug#27265: [PATCH] file-systems: Use creation time if modification time is unset for ISO9660.
has caused the debbugs.gnu.org bug report #27265,
regarding [PATCH] file-systems: Use creation time if modification time is unset for ISO9660.
to be marked as done.
(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)
--
27265: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=27265
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
* gnu/build/file-systems.scm (iso9660-superblock-uuid): Modify.
---
gnu/build/file-systems.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 10be0dc83..7737de3d0 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -268,12 +268,18 @@ as a bytevector, or #f if DEVICE does not contain an iso9660 file system."
(define (iso9660-superblock-uuid sblock)
"Return the modification time of an iso9660 primary volume descriptor
-SBLOCK as a bytevector."
+SBLOCK as a bytevector. If that's not set, returns the creation time."
;; Drops GMT offset for compatibility with Grub, blkid and /dev/disk/by-uuid.
;; Compare Grub: "2014-12-02-19-30-23-00".
;; Compare blkid result: "2014-12-02-19-30-23-00".
;; Compare /dev/disk/by-uuid entry: "2014-12-02-19-30-23-00".
- (sub-bytevector sblock 830 16))
+ (let* ((creation-time (sub-bytevector sblock 813 17))
+ (modification-time (sub-bytevector sblock 830 17))
+ (unset-time (make-bytevector 17 0))
+ (time (if (bytevector=? unset-time modification-time)
+ creation-time
+ modification-time)))
+ (sub-bytevector time 0 16))) ; strips GMT offset.
(define (iso9660-uuid->string uuid)
"Given an UUID bytevector, return its timestamp string."
[Message part 3 (message/rfc822, inline)]
Hi Ludo,
On Wed, 07 Jun 2017 01:19:34 +0200
ludo <at> gnu.org (Ludovic Courtès) wrote:
> LGTM.
>
> I suppose this makes those UUIDs a bit more unique, right?
Yes, and it also aligns with what util-linux libblkid is doing (the same; see probe_iso9660 in util-linux-2.29.2/libblkid/src/superblocks/iso9660.c).
Pushed as c6aee77e297ee9c96412825127a921dbd1d10e92 to master.
This bug report was last modified 8 years and 71 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.