01/01: file-systems: Improve error handling in the iso9660 case - fixes boot problem.

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit fb03f44bb117226e7d67a85401ffbb54ad8858ed
Author: Danny Milosavljevic <address@hidden>
Date:   Sat Jun 3 19:55:57 2017 +0200

    file-systems: Improve error handling in the iso9660 case - fixes boot 
problem.
    
    * gnu/build/file-systems.scm (read-iso9660-superblock): Modify.
---
 gnu/build/file-systems.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 3e08733..10be0dc 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -260,7 +260,11 @@ volume descriptor from ~s"
   "Return the raw contents of DEVICE's iso9660 primary volume descriptor
 as a bytevector, or #f if DEVICE does not contain an iso9660 file system."
   ;; Start reading at sector 16.
-  (read-iso9660-primary-volume-descriptor device (* 2048 16)))
+  ;; Since we are not sure that the device contains an ISO9660 filesystem,
+  ;; we have to find that out first.
+  (if (read-superblock device (* 2048 16) 2048 iso9660-superblock?)
+      (read-iso9660-primary-volume-descriptor device (* 2048 16))
+      #f)) ; Device does not contain an iso9660 filesystem.
 
 (define (iso9660-superblock-uuid sblock)
   "Return the modification time of an iso9660 primary volume descriptor