From d2c19ed2b4404a71b14891d61476c81663207d7f Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 29 May 2012 17:59:42 +0200
Subject: [PATCH] New adjustemets to HFS+ by Vladimir Serbinenko.

---
 libisofs/hfsplus.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libisofs/hfsplus.c b/libisofs/hfsplus.c
index cb214bb..1952b0a 100644
--- a/libisofs/hfsplus.c
+++ b/libisofs/hfsplus.c
@@ -23,6 +23,7 @@
 #include "libisofs.h"
 #include "util.h"
 #include "ecma119.h"
+#include "system_area.h"
 
 
 #include <stdlib.h>
@@ -395,7 +396,10 @@ int hfsplus_tail_writer_compute_data_blocks(IsoImageWriter *writer)
   t->curblock += t->hfsp_allocation_blocks;
   t->curblock++;
   t->hfsp_total_blocks = t->curblock - t->hfsp_part_start;
-  return ISO_SUCCESS;
+
+  t->apm_block_size = 0x800;
+  return iso_quick_apm_entry(t, t->hfsp_part_start, t->hfsp_total_blocks,
+                            "HFSPLUS_Hybrid", "Apple_HFS");
 }
 
 static
@@ -539,10 +543,7 @@ write_sb (Ecma119Image *t)
 			   + (i == ISO_HFSPLUS_BLESS_OSX_FOLDER)),
 	      t->hfsp_bless_id[i], 4);
 
-    /* 
-       FIXME: set:
-       uint64_t num_serial;
-    */
+    memcpy (&sb.num_serial, &t->hfsp_serial_number, 8);
 
     ret = iso_write(t, &sb, sizeof (sb));
     if (ret < 0)