From 4d3a68fb7d6dbd445bb4ce795769613556ea165d Mon Sep 17 00:00:00 2001 From: Anarchos Date: Sat, 3 Feb 2024 19:24:22 +0000 Subject: [PATCH] netboot: bump size for tar decompression Add network add-ons drivers to the archive for x86_64 architecture too. Change-Id: I8296586d5f2b1f3d4c08250e28aefd32428b21b9 Reviewed-on: https://review.haiku-os.org/c/haiku/+/8522 Haiku-Format: Haiku-format Bot Tested-by: Commit checker robot Reviewed-by: Adrien Destugues --- build/jam/images/NetBootArchive | 4 ++-- src/system/boot/loader/file_systems/tarfs/tarfs.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/jam/images/NetBootArchive b/build/jam/images/NetBootArchive index 1726b249ce..b7a898abbe 100644 --- a/build/jam/images/NetBootArchive +++ b/build/jam/images/NetBootArchive @@ -7,7 +7,7 @@ SYSTEM_NETWORK_DATALINK_PROTOCOLS = ethernet_frame arp loopback_frame ; SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix ; SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures - x86 @{ + x86,x86_64 @{ 3com atheros813x atheros81xx @@ -22,7 +22,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures sis900 syskonnect attansic_l2 - }@ # x86 + }@ # x86,x86_64 rtl81xx etherpci diff --git a/src/system/boot/loader/file_systems/tarfs/tarfs.cpp b/src/system/boot/loader/file_systems/tarfs/tarfs.cpp index 2f3460b752..b8f2f706ec 100644 --- a/src/system/boot/loader/file_systems/tarfs/tarfs.cpp +++ b/src/system/boot/loader/file_systems/tarfs/tarfs.cpp @@ -35,7 +35,7 @@ static const uint32 kFloppyArchiveOffset = BOOT_ARCHIVE_IMAGE_OFFSET * 1024; // defined at build time, see build/jam/BuildSetup -static const size_t kTarRegionSize = 9 * 1024 * 1024; // 9 MB +static const size_t kTarRegionSize = 11 * 1024 * 1024; // 11 MB using std::nothrow;