From 407c09e2d9f356e5a69b40091c0c64c088ec7606 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 11 Jul 2011 12:29:40 +0200
Subject: [PATCH] Create /packages symlink on boot

Rename the package links directory from /package-links to just /packages
and create it when booting.
---
 headers/private/system/directories.h |  3 ++-
 src/system/kernel/fs/vfs_boot.cpp    | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/headers/private/system/directories.h b/headers/private/system/directories.h
index c2ff80a984..c8c070ef50 100644
--- a/headers/private/system/directories.h
+++ b/headers/private/system/directories.h
@@ -8,7 +8,7 @@
 
 #define kGlobalBinDirectory 			"/bin"
 #define kGlobalEtcDirectory 			"/etc"
-#define kGlobalPackageLinksDirectory	"/package-links"
+#define kGlobalPackageLinksDirectory	"/packages"
 #define kGlobalSystemDirectory 			"/system"
 #define kGlobalTempDirectory 			"/tmp"
 #define kGlobalVarDirectory 			"/var"
@@ -35,6 +35,7 @@
 #define kSystemDevelopDirectory 		"/boot/system/develop"
 #define kSystemLibDirectory 			"/boot/system/lib"
 #define kSystemPackagesDirectory 		"/boot/system/packages"
+#define kSystemPackageLinksDirectory 		"/boot/system/package-links"
 #define kSystemPreferencesDirectory 	"/boot/system/preferences"
 #define kSystemServersDirectory 		"/boot/system/servers"
 
diff --git a/src/system/kernel/fs/vfs_boot.cpp b/src/system/kernel/fs/vfs_boot.cpp
index eeddab0675..22d7e4cf12 100644
--- a/src/system/kernel/fs/vfs_boot.cpp
+++ b/src/system/kernel/fs/vfs_boot.cpp
@@ -46,11 +46,12 @@ static struct {
 	const char *path;
 	const char *target;
 } sPredefinedLinks[] = {
-	{ kGlobalSystemDirectory,	kSystemDirectory },
-	{ kGlobalBinDirectory,		kSystemBinDirectory },
-	{ kGlobalEtcDirectory,		kCommonEtcDirectory },
-	{ kGlobalTempDirectory,		kCommonTempDirectory },
-	{ kGlobalVarDirectory,		kCommonVarDirectory },
+	{ kGlobalSystemDirectory,		kSystemDirectory },
+	{ kGlobalBinDirectory,			kSystemBinDirectory },
+	{ kGlobalEtcDirectory,			kCommonEtcDirectory },
+	{ kGlobalTempDirectory,			kCommonTempDirectory },
+	{ kGlobalVarDirectory,			kCommonVarDirectory },
+	{ kGlobalPackageLinksDirectory,	kSystemPackageLinksDirectory },
 	{NULL}
 };