From cc0838da34abe9840b09cc5c9540b7ed9e85bd45 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 12 Sep 2013 23:31:47 +0200 Subject: [PATCH] VFS boot: Mount packagefs when booting off an image ... and the mounted boot volume looks like a PM Haiku. This gets the CD boot going. --- src/system/kernel/fs/vfs_boot.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/system/kernel/fs/vfs_boot.cpp b/src/system/kernel/fs/vfs_boot.cpp index bdd6da6e17..58ccf165e5 100644 --- a/src/system/kernel/fs/vfs_boot.cpp +++ b/src/system/kernel/fs/vfs_boot.cpp @@ -515,7 +515,10 @@ vfs_mount_boot_file_system(kernel_args* args) } // If we're booting off a packaged system, mount packagefs. - if (bootVolume.GetBool(BOOT_VOLUME_PACKAGED, false)) { + struct stat st; + if (bootVolume.GetBool(BOOT_VOLUME_PACKAGED, false) + || (bootVolume.GetBool(BOOT_VOLUME_BOOTED_FROM_IMAGE, false) + && lstat(kSystemPackagesDirectory, &st) == 0)) { static const char* const kPackageFSName = "packagefs"; dev_t packageMount = _kern_mount("/boot/system", NULL, kPackageFSName,