VFS: Pass packages state selected in boot loader to packagefs

haiku · Apr 18, 2014 · 6b3a5ca · 6b3a5ca
1 parent 8585939
commit 6b3a5ca
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/system/kernel/fs/vfs_boot.cpp b/src/system/kernel/fs/vfs_boot.cpp
@@ -526,9 +526,17 @@ vfs_mount_boot_file_system(kernel_args* args)
 			&& lstat(kSystemPackagesDirectory, &st) == 0)) {
 		static const char* const kPackageFSName = "packagefs";
 
+		char arguments[256];
+		strlcpy(arguments, "packages /boot/system/packages; type system",
+			sizeof(arguments));
+		if (const char* stateName
+				= bootVolume.GetString(BOOT_VOLUME_PACKAGES_STATE, NULL)) {
+			strlcat(arguments, "; state ", sizeof(arguments));
+			strlcat(arguments, stateName, sizeof(arguments));
+		}
+
 		dev_t packageMount = _kern_mount("/boot/system", NULL, kPackageFSName,
-			0, "packages /boot/system/packages; type system",
-			0 /* unused argument length */);
+			0, arguments, 0 /* unused argument length */);
 		if (packageMount < 0) {
 			panic("Failed to mount system packagefs: %s",
 				strerror(packageMount));