diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2017-06-06 10:50:37 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-06-07 08:34:52 +0200 |
| commit | c6aee77e297ee9c96412825127a921dbd1d10e92 (patch) | |
| tree | f84948025cce7f33ae5b74c4f91cead9f338d8a7 | |
| parent | 15df12beae9f01c87bae85a9a60edf72d8b6ed66 (diff) | |
| download | patches-c6aee77e297ee9c96412825127a921dbd1d10e92.tar patches-c6aee77e297ee9c96412825127a921dbd1d10e92.tar.gz | |
file-systems: Use creation time if modification time is unset for ISO9660.
* gnu/build/file-systems.scm (iso9660-superblock-uuid): Modify.
| -rw-r--r-- | gnu/build/file-systems.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 10be0dc83c..7737de3d03 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." |