Prepare bootloader for use in installer

x86_64/disk.asm

@@ -17,12 +17,14 @@ startup_end:
       incbin KERNEL_STR
     .end:
     align 512, db 0
-%endif
-
-%ifdef FILESYSTEM
-    filesystem:
-        %defstr FILESYSTEM_STR %[FILESYSTEM]
-        incbin FILESYSTEM_STR
-    .end:
-    align 512, db 0
+%else
+    %ifdef FILESYSTEM
+        filesystem:
+            %defstr FILESYSTEM_STR %[FILESYSTEM]
+            incbin FILESYSTEM_STR
+        .end:
+        align 512, db 0
+    %else
+        filesystem:
+    %endif
 %endif

x86_64/startup-common.asm

@@ -19,15 +19,12 @@ startup:
         add ecx, 511
         shr ecx, 9
         call load_extent
-
-        jmp .loaded_kernel
-    %endif
-
-    %ifdef FILESYSTEM
+    %else
         call redoxfs
-        jmp .loaded_kernel
     %endif
 
+    jmp .loaded_kernel
+
 .loaded_kernel:
     call memory_map
 
@@ -126,7 +123,7 @@ load_extent:
 %include "memory_map.asm"
 %include "vesa.asm"
 %include "initialize.asm"
-%ifdef FILESYSTEM
+%ifndef KERNEL
     %include "redoxfs.asm"
 %endif