i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also mount the packagefs at ~/config

Browse Source
This commit is contained in:
Ingo Weinhold
2013-08-25 18:23:11 +02:00
parent 0214aefd58
commit e64db4da44
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/HaikuImage
+1 -1
View File
@@ -304,7 +304,7 @@ AddDirectoryToHaikuImage common var empty ;
AddDirectoryToHaikuImage common var log ; AddDirectoryToHaikuImage common var log ;
AddDirectoryToHaikuImage home Desktop ; AddDirectoryToHaikuImage home Desktop ;
AddDirectoryToHaikuImage home mail ; AddDirectoryToHaikuImage home mail ;
AddDirectoryToHaikuImage home config packages ;
AddDirectoryToHaikuImage home config non-packaged bin ; AddDirectoryToHaikuImage home config non-packaged bin ;
AddDirectoryToHaikuImage home config non-packaged lib ; AddDirectoryToHaikuImage home config non-packaged lib ;
AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ; AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ;
build/jam/images/HaikuImageBootstrap
+1 -1
View File
@@ -245,7 +245,7 @@ AddDirectoryToHaikuImage common var empty ;
AddDirectoryToHaikuImage common var log ; AddDirectoryToHaikuImage common var log ;
AddDirectoryToHaikuImage home Desktop ; AddDirectoryToHaikuImage home Desktop ;
AddDirectoryToHaikuImage home mail ; AddDirectoryToHaikuImage home mail ;
AddDirectoryToHaikuImage home config packages ;
AddDirectoryToHaikuImage home config non-packaged bin ; AddDirectoryToHaikuImage home config non-packaged bin ;
AddDirectoryToHaikuImage home config non-packaged lib ; AddDirectoryToHaikuImage home config non-packaged lib ;
AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ; AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ;
src/system/kernel/fs/vfs_boot.cpp
+15 -9
View File
@@ -518,22 +518,28 @@ vfs_mount_boot_file_system(kernel_args* args)
if (bootVolume.GetBool(BOOT_VOLUME_PACKAGED, false)) { if (bootVolume.GetBool(BOOT_VOLUME_PACKAGED, false)) {
static const char* const kPackageFSName = "packagefs"; static const char* const kPackageFSName = "packagefs";
dev_t systemPackageMount = _kern_mount("/boot/system", dev_t packageMount = _kern_mount("/boot/system", NULL, kPackageFSName,
NULL, kPackageFSName, 0, 0, "packages /boot/system/packages; type system",
"packages /boot/system/packages; type system",
0 /* unused argument length */); 0 /* unused argument length */);
if (systemPackageMount < 0) { if (packageMount < 0) {
panic("Failed to mount system packagefs: %s", panic("Failed to mount system packagefs: %s",
strerror(systemPackageMount)); strerror(packageMount));
} }
dev_t commonPackageMount = _kern_mount("/boot/common", packageMount = _kern_mount("/boot/common", NULL, kPackageFSName, 0,
NULL, kPackageFSName, 0,
"packages /boot/common/packages; type common", "packages /boot/common/packages; type common",
0 /* unused argument length */); 0 /* unused argument length */);
if (commonPackageMount < 0) { if (packageMount < 0) {
dprintf("Failed to mount common packagefs: %s\n", dprintf("Failed to mount common packagefs: %s\n",
strerror(commonPackageMount)); strerror(packageMount));
}
packageMount = _kern_mount("/boot/home/config", NULL, kPackageFSName, 0,
"packages /boot/home/config/packages; type home",
0 /* unused argument length */);
if (packageMount < 0) {
dprintf("Failed to mount home packagefs: %s\n",
strerror(packageMount));
} }
} }