From a079780e8a83240e16484ed42103234dd2994a03 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 14 Feb 2009 00:11:15 +0000 Subject: [PATCH] * Add the iso9660 filesystem to the floppy image. * Allow iso9660 partitions to be boot partitions. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29193 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/FloppyBootImage | 2 +- src/system/kernel/fs/vfs_boot.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage index edd65e5eef..caff58b654 100644 --- a/build/jam/FloppyBootImage +++ b/build/jam/FloppyBootImage @@ -33,7 +33,7 @@ BOOT_ADD_ONS_NET = BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi config_manager agp_gart usb ; -BEOS_ADD_ONS_FILE_SYSTEMS = bfs ; +BEOS_ADD_ONS_FILE_SYSTEMS = bfs iso9660 ; #cdda fat googlefs iso9660 nfs ; diff --git a/src/system/kernel/fs/vfs_boot.cpp b/src/system/kernel/fs/vfs_boot.cpp index 9a6ebeaaf4..eee6ef29fa 100644 --- a/src/system/kernel/fs/vfs_boot.cpp +++ b/src/system/kernel/fs/vfs_boot.cpp @@ -259,7 +259,8 @@ DiskBootMethod::IsBootPartition(KPartition* partition, bool& foundForSure) } if (partition->ContentType() != NULL - && !strcmp(partition->ContentType(), "Be File System")) { + && (!strcmp(partition->ContentType(), "Be File System") + || !strcmp(partition->ContentType(), "ISO9660 File System"))) { return true; } }