[haiku-commits] r35104 - in haiku/trunk: build/jam data/system/boot src/apps/text_search src/system/kernel/fs src/system/libroot/os ...
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 16 Jan 2010 18:17:07 +0100 (CET)
Author: axeld
Date: 2010-01-16 18:17:07 +0100 (Sat, 16 Jan 2010)
New Revision: 35104
Changeset: http://dev.haiku-os.org/changeset/35104/haiku
Modified:
haiku/trunk/build/jam/HaikuImage
haiku/trunk/data/system/boot/Bootscript
haiku/trunk/src/apps/text_search/Grepper.cpp
haiku/trunk/src/system/kernel/fs/vfs_boot.cpp
haiku/trunk/src/system/libroot/os/find_directory.c
haiku/trunk/src/system/libroot/posix/sys/mman.cpp
haiku/trunk/src/tests/kits/storage/EntryTest.cpp
Log:
* Moved the "var" directory to /boot/common/.
* Moved the "tmp" directory out of /var, and to /boot/common/cache/.
Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage 2010-01-16 16:49:57 UTC (rev 35103)
+++ haiku/trunk/build/jam/HaikuImage 2010-01-16 17:17:07 UTC (rev 35104)
@@ -551,9 +551,9 @@
AddDirectoryToHaikuImage home config bin ;
AddDirectoryToHaikuImage home config lib ;
AddDirectoryToHaikuImage home mail ;
-AddDirectoryToHaikuImage var empty ;
-AddDirectoryToHaikuImage var log ;
-AddDirectoryToHaikuImage var tmp ;
+AddDirectoryToHaikuImage common var empty ;
+AddDirectoryToHaikuImage common var log ;
+AddDirectoryToHaikuImage common cache tmp ;
AddDirectoryToHaikuImage home config add-ons kernel drivers bin ;
AddDirectoryToHaikuImage home config add-ons kernel drivers dev ;
Modified: haiku/trunk/data/system/boot/Bootscript
===================================================================
--- haiku/trunk/data/system/boot/Bootscript 2010-01-16 16:49:57 UTC (rev
35103)
+++ haiku/trunk/data/system/boot/Bootscript 2010-01-16 17:17:07 UTC (rev
35104)
@@ -58,7 +58,7 @@
SERVERS=system/servers
# clean the shared memory dir
-shmDir=/boot/var/shared_memory
+shmDir=/var/shared_memory
rm -rf $shmDir
mkdir -p $shmDir
chmod 777 $shmDir
Modified: haiku/trunk/src/apps/text_search/Grepper.cpp
===================================================================
--- haiku/trunk/src/apps/text_search/Grepper.cpp 2010-01-16 16:49:57 UTC
(rev 35103)
+++ haiku/trunk/src/apps/text_search/Grepper.cpp 2010-01-16 17:17:07 UTC
(rev 35104)
@@ -20,6 +20,7 @@
* DEALINGS IN THE SOFTWARE.
*/
+
#include "Grepper.h"
#include <new>
@@ -176,7 +177,7 @@
char command[B_PATH_NAME_LENGTH + 32];
BPath tempFile;
- sprintf(fileName, "/boot/var/tmp/SearchText%ld", fThreadId);
+ sprintf(fileName, "/tmp/SearchText%ld", fThreadId);
tempFile.SetTo(fileName);
while (!fMustQuit && fIterator->GetNextName(fileName)) {
@@ -249,7 +250,7 @@
// We wait with removing the temporary file until after the
// entire search has finished, to prevent a lot of flickering
- // if the Tracker window for /boot/var/tmp/ might be open.
+ // if the Tracker window for /tmp/ might be open.
remove(tempFile.Path());
Modified: haiku/trunk/src/system/kernel/fs/vfs_boot.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs_boot.cpp 2010-01-16 16:49:57 UTC
(rev 35103)
+++ haiku/trunk/src/system/kernel/fs/vfs_boot.cpp 2010-01-16 17:17:07 UTC
(rev 35104)
@@ -1,6 +1,6 @@
/*
* Copyright 2007, Ingo Weinhold, bonefish@xxxxxxxxxxxxxxxx
- * Copyright 2002-2009, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
+ * Copyright 2002-2010, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
* Distributed under the terms of the MIT License.
*
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -48,8 +48,8 @@
{"/system", "/boot/system"},
{"/bin", "/boot/system/bin"},
{"/etc", "/boot/common/etc"},
- {"/var", "/boot/var"},
- {"/tmp", "/boot/var/tmp"},
+ {"/var", "/boot/common/var"},
+ {"/tmp", "/boot/common/cache/tmp"},
{NULL}
};
Modified: haiku/trunk/src/system/libroot/os/find_directory.c
===================================================================
--- haiku/trunk/src/system/libroot/os/find_directory.c 2010-01-16 16:49:57 UTC
(rev 35103)
+++ haiku/trunk/src/system/libroot/os/find_directory.c 2010-01-16 17:17:07 UTC
(rev 35104)
@@ -1,6 +1,6 @@
/*
* Copyright 2004, François Revol.
- * Copyright 2007-2009, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
+ * Copyright 2007-2010, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
*
* Distributed under the terms of the MIT license.
*/
@@ -72,10 +72,10 @@
COMMON "/documentation",
COMMON "/settings",
"develop",
// B_COMMON_DEVELOP_DIRECTORY
- "var/log",
// B_COMMON_LOG_DIRECTORY
- "var/spool", //
B_COMMON_SPOOL_DIRECTORY
- "var/tmp",
// B_COMMON_TEMP_DIRECTORY
- "var",
// B_COMMON_VAR_DIRECTORY
+ COMMON "/var/log", //
B_COMMON_LOG_DIRECTORY
+ COMMON "/var/spool", //
B_COMMON_SPOOL_DIRECTORY
+ COMMON "/cache/tmp", //
B_COMMON_TEMP_DIRECTORY
+ COMMON "/var", //
B_COMMON_VAR_DIRECTORY
COMMON "/add-ons/Translators",
COMMON "/add-ons/media",
COMMON "/data/sounds",
Modified: haiku/trunk/src/system/libroot/posix/sys/mman.cpp
===================================================================
--- haiku/trunk/src/system/libroot/posix/sys/mman.cpp 2010-01-16 16:49:57 UTC
(rev 35103)
+++ haiku/trunk/src/system/libroot/posix/sys/mman.cpp 2010-01-16 17:17:07 UTC
(rev 35104)
@@ -3,6 +3,7 @@
* Distributed under the terms of the MIT License.
*/
+
#include <sys/mman.h>
#include <errno.h>
@@ -16,7 +17,7 @@
#include <vm_defs.h>
-static const char* kSharedMemoryDir = "/boot/var/shared_memory/";
+static const char* kSharedMemoryDir = "/var/shared_memory/";
static bool
Modified: haiku/trunk/src/tests/kits/storage/EntryTest.cpp
===================================================================
--- haiku/trunk/src/tests/kits/storage/EntryTest.cpp 2010-01-16 16:49:57 UTC
(rev 35103)
+++ haiku/trunk/src/tests/kits/storage/EntryTest.cpp 2010-01-16 17:17:07 UTC
(rev 35104)
@@ -2243,7 +2243,7 @@
{
bool result = false;
if (path) {
- const char *harmlessDir = "/boot/var/tmp/";
+ const char *harmlessDir = "/tmp/";
result = (string(path).find(harmlessDir) == 0);
}
if (!result)
@@ -2370,14 +2370,13 @@
"1234567890123456789012345678901234567890123456789012345678901234567890"
"12345678901234567890123456789012345678901234567";
-// init_entry_test
-static
-void
+
+static void
init_entry_test()
{
// root dir for testing
testDir.initDir(badTestEntry, "testDir");
- testDir.initPath((string("/boot/var/tmp/") + testDir.name).c_str());
+ testDir.initPath((string("/tmp/") + testDir.name).c_str());
allTestEntries.pop_back();
// other entries
dir1.initDir(testDir, "dir1");
Other related posts:
