Index: trunk/i386/boot0/boot0.s
===================================================================
--- trunk/i386/boot0/boot0.s	(revision 2425)
+++ trunk/i386/boot0/boot0.s	(revision 2426)
@@ -88,6 +88,7 @@
 
 kPartCount			EQU  4				; number of paritions per table
 kPartTypeHFS		EQU  0xaf			; HFS+ Filesystem type
+kPartTypeABHFS		EQU  0xab			; Apple_Boot partition
 kPartTypePMBR		EQU  0xee			; On all GUID Partition Table disks a Protective MBR (PMBR)
 										; in LBA 0 (that is, the first block) precedes the
 										; GUID Partition Table Header to maintain compatibility
@@ -764,7 +765,6 @@
 ; NULL terminated strings.
 ;
 log_title_str		db  10, 13, 'boot0: ', 0
-boot_error_str   	db  'error', 0
 
 %if VERBOSE
 gpt_str			db  'GPT', 0
@@ -772,6 +772,8 @@
 done_str		db  'done', 0
 %endif
 
+boot_error_str   	db  'error', 0
+
 ;--------------------------------------------------------------------------
 ; Pad the rest of the 512 byte sized booter with zeroes. The last
 ; two bytes is the mandatory boot sector signature.
Index: trunk/i386/boot0/boot0hfs.s
===================================================================
--- trunk/i386/boot0/boot0hfs.s	(revision 2425)
+++ trunk/i386/boot0/boot0hfs.s	(revision 2426)
@@ -88,6 +88,7 @@
 
 kPartCount			EQU  4				; number of paritions per table
 kPartTypeHFS		EQU  0xaf			; HFS+ Filesystem type
+kPartTypeABHFS		EQU  0xab			; Apple_Boot partition
 kPartTypePMBR		EQU  0xee			; On all GUID Partition Table disks a Protective MBR (PMBR)
 										; in LBA 0 (that is, the first block) precedes the
 										; GUID Partition Table Header to maintain compatibility
@@ -763,7 +764,6 @@
 ; NULL terminated strings.
 ;
 log_title_str		db  10, 13, 'boot0: ', 0
-boot_error_str   	db  'error', 0
 
 %if VERBOSE
 gpt_str			db  'GPT', 0
@@ -771,6 +771,8 @@
 done_str		db  'done', 0
 %endif
 
+boot_error_str   	db  'error', 0
+
 ;--------------------------------------------------------------------------
 ; Pad the rest of the 512 byte sized booter with zeroes. The last
 ; two bytes is the mandatory boot sector signature.
Index: trunk/i386/boot0/boot0md.s
===================================================================
--- trunk/i386/boot0/boot0md.s	(revision 2425)
+++ trunk/i386/boot0/boot0md.s	(revision 2426)
@@ -442,12 +442,11 @@
     jne     .continue
 
 
+.tryToBoot:
     ;
     ; Found boot partition, read boot sector to memory.
     ;
 
-.tryToBoot:
-
     call    loadBootSector
     jne     .continue
     jmp	    SHORT initBootLoader
@@ -868,7 +867,6 @@
 ; NULL terminated strings.
 ;
 log_title_str		db  10, 13, 'boot0:', 0
-boot_error_str   	db  'error', 0
 
 gpt_str			db  'GPT', 0
 ;test_str		db  'test', 0
@@ -876,6 +874,8 @@
 
 %endif
 
+boot_error_str   	db  'error', 0
+
 ;--------------------------------------------------------------------------
 ; Pad the rest of the 512 byte sized booter with zeroes. The last
 ; two bytes is the mandatory boot sector signature.
Index: trunk/i386/boot1/boot1f32.s
===================================================================
--- trunk/i386/boot1/boot1f32.s	(revision 2425)
+++ trunk/i386/boot1/boot1f32.s	(revision 2426)
@@ -75,7 +75,7 @@
 kBoot1LoadAddr		EQU		0x7C00								; boot1 load address
 kBoot1RelocAddr		EQU		0xE000								; boot1 relocated address
 
-kBoot2Sectors		EQU		(448 * 1024 - 512) / kSectorBytes	; max size of 'boot' file in sectors
+kBoot2Sectors		EQU		(480 * 1024 - 512) / kSectorBytes	; max size of 'boot' file in sectors
 kBoot2Segment		EQU		0x2000								; boot2 load segment
 kBoot2Address		EQU		kSectorBytes						; boot2 load address
 
Index: trunk/i386/boot1/boot1he.s
===================================================================
--- trunk/i386/boot1/boot1he.s	(revision 2425)
+++ trunk/i386/boot1/boot1he.s	(revision 2426)
@@ -79,7 +79,7 @@
 kBoot1ExtAddr		EQU		kBoot1RelocAddr + kSectorBytes		; boot1 load address for sector 41-47
 kHFSPlusBuffer		EQU		kBoot1RelocAddr + kBoot1ExtSize		; HFS+ Volume Header address
 
-kBoot2Sectors		EQU		(448 * 1024 - 512) / kSectorBytes	; max size of 'boot' file in sectors
+kBoot2Sectors		EQU		(480 * 1024 - 512) / kSectorBytes	; max size of 'boot' file in sectors = 448 but I want 472
 kBoot2Segment		EQU		0x2000								; boot2 load segment
 kBoot2Address		EQU		kSectorBytes						; boot2 load address
 
Index: trunk/i386/boot1/boot1h.s
===================================================================
--- trunk/i386/boot1/boot1h.s	(revision 2425)
+++ trunk/i386/boot1/boot1h.s	(revision 2426)
@@ -977,7 +977,7 @@
 ;
 
 %if VERBOSE
-root_str			db		'/boot', NULL
+root_str			db		'/boot', CR, LF, NULL
 %endif
 
 ;--------------------------------------------------------------------------
@@ -1431,8 +1431,8 @@
 ;
 
 %if VERBOSE
-log_title_str		db		CR, LF, 'boot1: ', NULL
-error_str			db		'error', NULL
+log_title_str		db		'boot1: ', NULL
+error_str		db		'error', NULL
 %endif
 
 searchCatalogKey	dd		kHFSRootFolderID
Index: trunk/CHANGES
===================================================================
--- trunk/CHANGES	(revision 2425)
+++ trunk/CHANGES	(revision 2426)
@@ -1,3 +1,4 @@
+- Slice and Clover Team : Replace "NULL" terminated strings and fit Boot2 Sectors size
 - ErmaC : Update bootargs
 - crazybirdy : Fit length for "Loading Darwin"
 - meklort : Update align directives to 2^(old_align)