From 766f682338c5d80cde6864869ad308f5bab56300 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 6 Aug 2016 20:20:35 +0200 Subject: [PATCH] Fix build and first runtime problem in network boot The boot still crashes some time later, but at least it is easier to test now. - PackageFS included in the net boot archive - Tell the system it is booted "from image" when netbooting --- build/jam/images/NetBootArchive | 5 ++--- src/system/boot/platform/pxe_ia32/devices.cpp | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/jam/images/NetBootArchive b/build/jam/images/NetBootArchive index b5ecbe52b0..e4ba611c81 100644 --- a/build/jam/images/NetBootArchive +++ b/build/jam/images/NetBootArchive @@ -23,7 +23,7 @@ SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures pci isa@x86 ide@ide ata@ata scsi config_manager agp_gart ] ; -SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs fat iso9660 ; +SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs packagefs ; # modules @@ -71,7 +71,7 @@ AddFilesToNetBootArchive home config settings kernel drivers # add-ons AddFilesToNetBootArchive system add-ons kernel network - : notifications stack ; + : stack ; AddFilesToNetBootArchive system add-ons kernel network devices : $(SYSTEM_NETWORK_DEVICES) ; AddFilesToNetBootArchive @@ -93,7 +93,6 @@ AddBootModuleSymlinksToNetBootArchive openpic@ppc generic_x86@x86 # nbd - notifications remote_disk $(SYSTEM_ADD_ONS_DRIVERS_NET) stack diff --git a/src/system/boot/platform/pxe_ia32/devices.cpp b/src/system/boot/platform/pxe_ia32/devices.cpp index 6dd064fc78..73a7c8f505 100644 --- a/src/system/boot/platform/pxe_ia32/devices.cpp +++ b/src/system/boot/platform/pxe_ia32/devices.cpp @@ -75,7 +75,8 @@ platform_add_boot_device(struct stage2_args *args, NodeList *devicesList) platform_free_region(data, size); return B_NO_MEMORY; } - + + gBootVolume.SetBool(BOOT_VOLUME_BOOTED_FROM_IMAGE, true); devicesList->Add(disk); return B_OK; } else {