Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Removed /system/etc directory.

Browse Source 
* /etc now points to /boot/common/etc/, and the remaining contents of the former
  "etc" are put there now, as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33986 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-11-10 14:26:42 +00:00
parent 3734adc5b3
commit 492dd892ce
7 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/jam/HaikuImage
View File

@ -381,7 +381,7 @@ local spellFiles = words geekspeak ;
spellFiles = $(spellFiles:G=spell) ;
SEARCH on $(spellFiles)
= [ FDirName $(HAIKU_TOP) src apps mail ] ;
AddFilesToHaikuImage system etc word_dictionary : $(spellFiles) ;
AddFilesToHaikuImage common etc word_dictionary : $(spellFiles) ;
# Locale kit language files
local languageDir = [ FDirName $(HAIKU_TOP) src data locale languages ] ;
@ -392,14 +392,14 @@ local etcFiles = bash_completion inputrc profile ;
etcFiles = $(etcFiles:G=etc) ;
SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
AddFilesToHaikuImage system etc : $(etcFiles) ;
AddFilesToHaikuImage common etc : $(etcFiles) ;
SEARCH on <bash_completion>subversion =
[ FDirName $(HAIKU_TOP) data etc bash_completion.d ] ;
AddFilesToHaikuImage system etc bash_completion.d : <bash_completion>subversion ;
AddFilesToHaikuImage common etc bash_completion.d : <bash_completion>subversion ;
SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
AddFilesToHaikuImage system etc vim : <etc>vimrc ;
AddFilesToHaikuImage common etc vim : <etc>vimrc ;
local dataFiles = teapot.data ;
dataFiles = $(dataFiles:G=data) ;

2
build/jam/ImageRules
View File

@ -784,7 +784,7 @@ rule AddEntryToHaikuImageUserGroupFile file : entry
Always $(file) ;
MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
BuildHaikuImageUserGroupFile $(file) ;
AddFilesToHaikuImage system etc : $(file) ;
AddFilesToHaikuImage common etc : $(file) ;
}
HAIKU_IMAGE_USER_GROUP_ENTRIES on $(file) = $(allEntries) ;

2
build/jam/OptionalPackages
View File

@ -148,7 +148,7 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
AddSymlinkToHaikuImage beos : ../system/apps ;
AddSymlinkToHaikuImage beos : ../system/bin ;
AddSymlinkToHaikuImage beos : ../system/documentation ;
AddSymlinkToHaikuImage beos : ../system/etc ;
AddSymlinkToHaikuImage beos : ../common/etc ;
AddSymlinkToHaikuImage beos : ../system/preferences ;
AddSymlinkToHaikuImage beos : ../system ;
}

17
headers/os/storage/FindDirectory.h
View File

@ -11,20 +11,19 @@
typedef enum {
/* Per volume directories */
B_DESKTOP_DIRECTORY = 0,
B_DESKTOP_DIRECTORY = 0,
B_TRASH_DIRECTORY,
/* System directories */
B_SYSTEM_DIRECTORY = 1000,
B_SYSTEM_ADDONS_DIRECTORY = 1002,
B_SYSTEM_DIRECTORY = 1000,
B_SYSTEM_ADDONS_DIRECTORY = 1002,
B_SYSTEM_BOOT_DIRECTORY,
B_SYSTEM_FONTS_DIRECTORY,
B_SYSTEM_LIB_DIRECTORY,
B_SYSTEM_SERVERS_DIRECTORY,
B_SYSTEM_APPS_DIRECTORY,
B_SYSTEM_BIN_DIRECTORY,
B_SYSTEM_ETC_DIRECTORY,
B_SYSTEM_DOCUMENTATION_DIRECTORY,
B_SYSTEM_DOCUMENTATION_DIRECTORY = 1010,
B_SYSTEM_PREFERENCES_DIRECTORY,
B_SYSTEM_TRANSLATORS_DIRECTORY,
B_SYSTEM_MEDIA_NODES_DIRECTORY,
@ -32,7 +31,7 @@ typedef enum {
B_SYSTEM_DATA_DIRECTORY,
/* Common directories, shared among all users. */
B_COMMON_DIRECTORY = 2000,
B_COMMON_DIRECTORY = 2000,
B_COMMON_SYSTEM_DIRECTORY,
B_COMMON_ADDONS_DIRECTORY,
B_COMMON_BOOT_DIRECTORY,
@ -55,7 +54,7 @@ typedef enum {
/* User directories. These are interpreted in the context
of the user making the find_directory call. */
B_USER_DIRECTORY = 3000,
B_USER_DIRECTORY = 3000,
B_USER_CONFIG_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
B_USER_BOOT_DIRECTORY,
@ -71,12 +70,12 @@ typedef enum {
B_USER_CACHE_DIRECTORY,
/* Global directories. */
B_APPS_DIRECTORY = 4000,
B_APPS_DIRECTORY = 4000,
B_PREFERENCES_DIRECTORY,
B_UTILITIES_DIRECTORY,
/* Obsolete: Legacy BeOS definition to be phased out */
B_BEOS_DIRECTORY = 1000,
B_BEOS_DIRECTORY = 1000,
B_BEOS_SYSTEM_DIRECTORY,
B_BEOS_ADDONS_DIRECTORY,
B_BEOS_BOOT_DIRECTORY,

1
src/bin/finddir.c
View File

@ -40,7 +40,6 @@ directoryType directoryTypes[] = {
KEYVALUE_PAIR(B_SYSTEM_SERVERS_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_APPS_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_BIN_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_ETC_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_DOCUMENTATION_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_PREFERENCES_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_TRANSLATORS_DIRECTORY),

4
src/system/kernel/fs/vfs_boot.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright 2007, Ingo Weinhold, bonefish@cs.tu-berlin.de.
* Copyright 2002-2007, Axel Dörfler, axeld@pinc-software.de.
* Copyright 2002-2009, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License.
*
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@ -47,7 +47,7 @@ static struct {
} sPredefinedLinks[] = {
{"/system", "/boot/system"},
{"/bin", "/boot/system/bin"},
{"/etc", "/boot/system/etc"},
{"/etc", "/boot/common/etc"},
{"/var", "/boot/var"},
{"/tmp", "/boot/var/tmp"},
{NULL}

4
src/system/libroot/os/find_directory.c
View File

@ -44,7 +44,7 @@ static const char *kSystemDirectories[] = {
SYSTEM "/servers",
SYSTEM "/apps",
SYSTEM "/bin",
SYSTEM "/etc",
"common/etc",
SYSTEM "/documentation",
SYSTEM "/preferences",
SYSTEM "/add-ons/Translators",
@ -216,7 +216,7 @@ find_directory(directory_which which, dev_t device, bool createIt,
case B_SYSTEM_SERVERS_DIRECTORY:
case B_SYSTEM_APPS_DIRECTORY:
case B_SYSTEM_BIN_DIRECTORY:
case B_SYSTEM_ETC_DIRECTORY:
case B_BEOS_ETC_DIRECTORY:
case B_SYSTEM_DOCUMENTATION_DIRECTORY:
case B_SYSTEM_PREFERENCES_DIRECTORY:
case B_SYSTEM_TRANSLATORS_DIRECTORY: