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.
This commit is contained in:
Ingo Weinhold 2013-09-12 23:31:47 +02:00
parent 3465e718e7
commit cc0838da34

View File

@ -515,7 +515,10 @@ vfs_mount_boot_file_system(kernel_args* args)
} }
// If we're booting off a packaged system, mount packagefs. // 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"; static const char* const kPackageFSName = "packagefs";
dev_t packageMount = _kern_mount("/boot/system", NULL, kPackageFSName, dev_t packageMount = _kern_mount("/boot/system", NULL, kPackageFSName,