* Changed directory structure as suggested on the mailing list.

* Made the TimeZoneView less error prone, and also actually use Haiku code (the
  previous check didn't work since it used #if, not #ifdef).
* Also took the liberty to rename our boot loader to haiku_loader, since I had
  to update the nasm binary anyway. Updated the assembly sources to nasm 2.0.
* I haven't found where the synth location in the MIDI code is specified,
  though.
* Also, NetBootArchive, and FloppyBootImage haven't been updated yet. Will do
  so next.
* Some optional packages still put their license to beos/etc/licenses. I didn't
  update them yet, as we'll probably do so anyway at some point. Also, I think
  we might want to introduce a common/data/licenses instead for those.
* If you encounter any problems, please tell!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29876 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/jam/BuildSetup

@@ -171,21 +171,21 @@ switch $(HAIKU_CPU) {
 	{
 		HAIKU_DEFINES += __POWERPC__ ;
 		HAIKU_BOOT_PLATFORM = openfirmware ;
-		# offset in floppy image (>= sizeof(zbeos))
+		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
 	}
 	case x86 :
 	{
 		HAIKU_DEFINES += __INTEL__ ;
 		HAIKU_BOOT_PLATFORM = bios_ia32 ;
-		# offset in floppy image (>= sizeof(zbeos))
+		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
 	}
 	case m68k :
 	{
 		HAIKU_DEFINES += __M68K__ ;
 		HAIKU_BOOT_PLATFORM = atari_m68k ;
-		# offset in floppy image (>= sizeof(zbeos))
+		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 130 ; # in kB
 	}
 	case * :

build/jam/HaikuImage

@@ -18,7 +18,7 @@ if $(INCLUDE_GPL_ADDONS) = 1 {
 	GPL_ONLY = "" ;
 }
 
-BEOS_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2
+SYSTEM_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2
 	cal cat catattr checkfs chgrp chmod chop chown chroot cksum clear
 	clockconfig cmp comm compress copyattr $(X86_ONLY)CortexAddOnHost cp
 	csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
@@ -48,50 +48,51 @@ BEOS_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2
 	zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
 ;
 
-BEOS_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProbe
+SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProbe
 	DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer LaunchBox
 	Magnify Mail MediaPlayer MidiPlayer NetworkStatus PackageInstaller People
 	PowerStatus ProcessController Screenshot ShowImage SoundRecorder StyledEdit
 	Terminal TextSearch TV Workspaces
 ;
-BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
+SYSTEM_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
 	FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen
 	ScreenSaver Sounds Time Touchpad <preference>Tracker VirtualMemory
 ;
-BEOS_DEMOS = BSnow Chart Clock $(X86_ONLY)Cortex FontDemo
+SYSTEM_DEMOS = BSnow Chart Clock $(X86_ONLY)Cortex FontDemo
 	$(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot Pairs
 	Playground Pulse Sudoku Gradients
 ;
-BEOS_SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
+SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
 	libtranslation.so libbnetapi.so libnetwork.so libdebug.so libbsd.so
 	libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so
 	libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
 	$(X86_ONLY)libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
 	libilmimf.so libiconv.so
 ;
-BEOS_SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
+SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
 	net_server media_addon_server input_server app_server fake_app_server
 	midi_server print_server mail_daemon
 ;
 
-BEOS_NETWORK_DEVICES = ethernet loopback ;
-BEOS_NETWORK_DATALINK_PROTOCOLS = ethernet_frame <module>arp loopback_frame
+SYSTEM_NETWORK_DEVICES = ethernet loopback ;
+SYSTEM_NETWORK_DATALINK_PROTOCOLS = ethernet_frame <module>arp loopback_frame
 	ipv4_datagram ;
-#BEOS_NETWORK_PPP = ipcp modem pap pppoe ;
-BEOS_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix ;
+#SYSTEM_NETWORK_PPP = ipcp modem pap pppoe ;
+SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix ;
 
-BEOS_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)nvidia.accelerant
-	$(X86_ONLY)matrox.accelerant $(X86_ONLY)neomagic.accelerant
-	$(X86_ONLY)intel_extreme.accelerant $(X86_ONLY)s3.accelerant $(X86_ONLY)vesa.accelerant
+SYSTEM_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant
+	$(X86_ONLY)nvidia.accelerant $(X86_ONLY)matrox.accelerant
+	$(X86_ONLY)neomagic.accelerant $(X86_ONLY)intel_extreme.accelerant
+	$(X86_ONLY)s3.accelerant $(X86_ONLY)vesa.accelerant
 	#$(X86_ONLY)via.accelerant
 	#$(X86_ONLY)vmware.accelerant
 ;
-BEOS_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator JPEGTranslator
-	JPEG2000Translator PCXTranslator PNGTranslator PPMTranslator RAWTranslator
-	RTF-Translator SGITranslator STXTTranslator TGATranslator
+SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
+	JPEGTranslator JPEG2000Translator PCXTranslator PNGTranslator PPMTranslator
+	RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator
 	TIFFTranslator WonderBrushTranslator
 ;
-BEOS_ADD_ONS_MEDIA = cortex_audioadapter.media_addon cortex_flanger.media_addon
+SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon cortex_flanger.media_addon
 	dvb.media_addon
 	hmulti_audio.media_addon
 	mixer.media_addon
@@ -103,7 +104,7 @@ BEOS_ADD_ONS_MEDIA = cortex_audioadapter.media_addon cortex_flanger.media_addon
 	firewire_dv.media_addon
 	#legacy.media_addon
 ;
-BEOS_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
+SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
 	aiff_reader au_reader $(X86_ONLY)avcodec avi_reader
 	matroska mov_reader
 	mp3_decoder mp3_reader
@@ -112,21 +113,21 @@ BEOS_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
 	# theora
 	vorbis wav_reader
 ;
-BEOS_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible
+SYSTEM_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible
 	PCL5\ Compatible PCL6\ Compatible PDF\ Writer PS\ Compatible Preview
 ;
-BEOS_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
+SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
 	Print\ To\ File Serial\ Port USB\ Port
 ;
-BEOS_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku IFS Spider Message ;
-BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
-BEOS_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
-BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
+SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku IFS Spider Message ;
+SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
+SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
+SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
 	$(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme
 	$(X86_ONLY)s3 $(X86_ONLY)vesa #$(X86_ONLY)via #$(X86_ONLY)vmware
 ;
-BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ;
-BEOS_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
+SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki ;
+SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
 	$(X86_ONLY)broadcom570x etherpci $(X86_ONLY)ipro1000
 	pegasus $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900
 	$(X86_ONLY)via_rhine wb840 $(X86_ONLY)ipro100 $(X86_ONLY)nforce
@@ -134,44 +135,44 @@ BEOS_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
 	$(X86_ONLY)marvell_yukon $(X86_ONLY)syskonnect
 	$(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx usb_ecm
 ;
-#BEOS_ADD_ONS_DRIVERS_ACPI = $(X86_ONLY)acpi_button ;
-BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa ide scsi
+#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
+SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa ide scsi
 	config_manager agp_gart usb firewire $(X86_ONLY)acpi
 ;
-BEOS_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
+SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
 	write_overlay $(GPL_ONLY)reiserfs ;
 #googlefs $(GPL_ONLY)ntfs ;
 
 
 # modules
-AddFilesToHaikuImage beos system add-ons kernel bus_managers
-	: $(BEOS_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToHaikuImage beos system add-ons kernel busses agp_gart
+AddFilesToHaikuImage system add-ons kernel bus_managers
+	: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
+AddFilesToHaikuImage system add-ons kernel busses agp_gart
 	: $(X86_ONLY)<agp_gart>intel ;
-AddFilesToHaikuImage beos system add-ons kernel busses ide
+AddFilesToHaikuImage system add-ons kernel busses ide
 	: generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ;
-AddFilesToHaikuImage beos system add-ons kernel busses scsi
+AddFilesToHaikuImage system add-ons kernel busses scsi
 	: ahci ;
-AddFilesToHaikuImage beos system add-ons kernel busses usb
+AddFilesToHaikuImage system add-ons kernel busses usb
 	: <usb>uhci <usb>ohci <usb>ehci ;
-AddFilesToHaikuImage beos system add-ons kernel console : vga_text ;
-AddFilesToHaikuImage beos system add-ons kernel debugger
+AddFilesToHaikuImage system add-ons kernel console : vga_text ;
+AddFilesToHaikuImage system add-ons kernel debugger
 	: $(X86_ONLY)<kdebug>disasm <kdebug>hangman <kdebug>invalidate_on_exit
 	<kdebug>usb_keyboard ;
-AddFilesToHaikuImage beos system add-ons kernel file_systems
-	: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToHaikuImage beos system add-ons kernel generic
+AddFilesToHaikuImage system add-ons kernel file_systems
+	: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
+AddFilesToHaikuImage system add-ons kernel generic
 	: dpc ide_adapter locked_pool mpu401 scsi_periph ;
-AddFilesToHaikuImage beos system add-ons kernel partitioning_systems
+AddFilesToHaikuImage system add-ons kernel partitioning_systems
 	: intel session ;
-AddFilesToHaikuImage beos system add-ons kernel interrupt_controllers
+AddFilesToHaikuImage system add-ons kernel interrupt_controllers
 	: $(PPC_ONLY)openpic ;
 
 if $(TARGET_ARCH) = x86 {
-	AddFilesToHaikuImage beos system add-ons kernel cpu : generic_x86 ;
+	AddFilesToHaikuImage system add-ons kernel cpu : generic_x86 ;
 
 	if $(HAIKU_GCC_VERSION[1]) = 2 {
-		AddFilesToHaikuImage beos system add-ons kernel debugger demangle :
+		AddFilesToHaikuImage system add-ons kernel debugger demangle :
 			<kdebug>gcc2 ;
 	}
 }
@@ -182,62 +183,62 @@ AddNewDriversToHaikuImage disk scsi	: scsi_cd scsi_disk ;
 # legacy drivers
 AddDriversToHaikuImage				: console dprintf $(X86_ONLY)keyboard null
 									  random <driver>tty zero ;
-AddDriversToHaikuImage audio hmulti	: $(BEOS_ADD_ONS_DRIVERS_AUDIO) ;
-AddDriversToHaikuImage audio old	: $(BEOS_ADD_ONS_DRIVERS_AUDIO_OLD) ;
-AddDriversToHaikuImage midi			: $(BEOS_ADD_ONS_DRIVERS_MIDI) ;
+AddDriversToHaikuImage audio hmulti	: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
+AddDriversToHaikuImage audio old	: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
+AddDriversToHaikuImage midi			: $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
 AddDriversToHaikuImage bus			: usb_raw fw_raw ;
 AddDriversToHaikuImage disk floppy	: $(X86_ONLY)pc_floppy ;
 AddDriversToHaikuImage disk usb		: usb_disk ;
 AddDriversToHaikuImage disk virtual	: nbd ;
 AddDriversToHaikuImage dvb			: cx23882 ;
-AddDriversToHaikuImage graphics		: $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ;
+AddDriversToHaikuImage graphics		: $(SYSTEM_ADD_ONS_DRIVERS_GRAPHICS) ;
 AddDriversToHaikuImage input		: ps2_hid usb_hid wacom ;
 AddDriversToHaikuImage misc			: <driver>poke <driver>test <driver>mem ;
-AddDriversToHaikuImage net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
-#AddDriversToHaikuImage power		: $(BEOS_ADD_ONS_DRIVERS_ACPI) ;
+AddDriversToHaikuImage net			: $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
+#AddDriversToHaikuImage power		: $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
 
 # kernel
-AddFilesToHaikuImage beos system : <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToHaikuImage system : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # libs
-AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIBS) ;
+AddFilesToHaikuImage system lib : $(SYSTEM_LIBS) ;
 
 # libnetwork.so replaces quite a few libraries
-BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES
+SYSTEM_LIBS_LIBNETWORK_ALIASES
 	= libsocket.so libbind.so libnet.so ;
 
 local lib ;
-for lib in $(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) {
-	AddSymlinkToHaikuImage beos system lib : libnetwork.so : $(lib) ;
+for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) {
+	AddSymlinkToHaikuImage system lib : libnetwork.so : $(lib) ;
 }
 
-AddSymlinkToHaikuImage beos system lib : libbnetapi.so : libnetapi.so ;
+AddSymlinkToHaikuImage system lib : libbnetapi.so : libnetapi.so ;
 
 # libGL.so has GLU (like BeOS) *and* GLUT API built-in
-BEOS_SYSTEM_LIBS_LIBGL_ALIASES
+SYSTEM_LIBS_LIBGL_ALIASES
 	= libGLU.so libglut.so ;
 
 if $(TARGET_ARCH) = x86 {
 local lib ;
-for lib in $(BEOS_SYSTEM_LIBS_LIBGL_ALIASES) {
-	AddSymlinkToHaikuImage beos system lib : libGL.so : $(lib) ;
+for lib in $(SYSTEM_LIBS_LIBGL_ALIASES) {
+	AddSymlinkToHaikuImage system lib : libGL.so : $(lib) ;
 }
 }
 
 # servers
-AddFilesToHaikuImage beos system servers : $(BEOS_SYSTEM_SERVERS) ;
+AddFilesToHaikuImage system servers : $(SYSTEM_SERVERS) ;
 
 # apps
-AddFilesToHaikuImage beos system		: runtime_loader Deskbar Tracker ;
-AddFilesToHaikuImage beos bin			: $(BEOS_BIN) consoled ;
-AddFilesToHaikuImage beos apps			: $(BEOS_APPS) ;
-AddFilesToHaikuImage beos preferences	: $(BEOS_PREFERENCES) ;
-AddFilesToHaikuImage beos demos			: $(BEOS_DEMOS) ;
+AddFilesToHaikuImage system				: runtime_loader Deskbar Tracker ;
+AddFilesToHaikuImage system bin			: $(SYSTEM_BIN) consoled ;
+AddFilesToHaikuImage system apps		: $(SYSTEM_APPS) ;
+AddFilesToHaikuImage system preferences	: $(SYSTEM_PREFERENCES) ;
+AddFilesToHaikuImage system demos		: $(SYSTEM_DEMOS) ;
 
 SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage beos bin			: which ;
+AddFilesToHaikuImage system bin			: which ;
 
-AddSymlinkToHaikuImage beos bin : sh : bash ;
+AddSymlinkToHaikuImage system bin : sh : bash ;
 
 AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
 
@@ -250,7 +251,7 @@ DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc
 local linkTarget ;
 for linkTarget in $(DESKBAR_APPLICATIONS) {
 	AddSymlinkToHaikuImage home config be Applications
-		: /boot/beos/apps/$(linkTarget) : $(linkTarget) ;
+		: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
 }
 
 # Deskbar Desktop Applets links
@@ -260,12 +261,12 @@ DESKBAR_DESKTOP_APPLETS = LaunchBox NetworkStatus PowerStatus ProcessController
 ;
 for linkTarget in $(DESKBAR_DESKTOP_APPLETS) {
 	AddSymlinkToHaikuImage home config be Desktop\ Applets
-		: /boot/beos/apps/$(linkTarget) : $(linkTarget) ;
+		: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
 }
 
 # Deskbar Preferences links
 AddDirectoryToHaikuImage home config be Preferences ;
-# TODO/NOTE: Cannot use $(BEOS_PREFERENCES) here since there is
+# TODO/NOTE: Cannot use $(SYSTEM_PREFERENCES) here since there is
 # "<preferences>Tracker"...
 DESKBAR_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
 	FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen
@@ -273,34 +274,34 @@ DESKBAR_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
 ;
 for linkTarget in $(DESKBAR_PREFERENCES) {
 	AddSymlinkToHaikuImage home config be Preferences
-		: /boot/beos/preferences/$(linkTarget) : $(linkTarget) ;
+		: /boot/system/preferences/$(linkTarget) : $(linkTarget) ;
 }
 
 # Deskbar Demo links
 AddDirectoryToHaikuImage home config be Demos ;
-for linkTarget in $(BEOS_DEMOS) {
+for linkTarget in $(SYSTEM_DEMOS) {
 	AddSymlinkToHaikuImage home config be Demos
-		: /boot/beos/demos/$(linkTarget) : $(linkTarget) ;
+		: /boot/system/demos/$(linkTarget) : $(linkTarget) ;
 }
 
-AddSymlinkToHaikuImage beos bin : bzip2 : bunzip2 ;
-AddSymlinkToHaikuImage beos bin : less : more ;
-AddSymlinkToHaikuImage beos bin : gzip : gunzip ;
-AddSymlinkToHaikuImage beos bin : gzip : zcat ;
-AddSymlinkToHaikuImage beos bin : zdiff : zcmp ;
-AddSymlinkToHaikuImage beos bin : unzip : zipinfo ;
-AddSymlinkToHaikuImage beos bin : gawk : awk ;
-AddSymlinkToHaikuImage beos bin : grep : egrep ;
-AddSymlinkToHaikuImage beos bin : grep : fgrep ;
-AddSymlinkToHaikuImage beos bin : vim : vi ;
-AddSymlinkToHaikuImage beos bin : vim : view ;
+AddSymlinkToHaikuImage system bin : bzip2 : bunzip2 ;
+AddSymlinkToHaikuImage system bin : less : more ;
+AddSymlinkToHaikuImage system bin : gzip : gunzip ;
+AddSymlinkToHaikuImage system bin : gzip : zcat ;
+AddSymlinkToHaikuImage system bin : zdiff : zcmp ;
+AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
+AddSymlinkToHaikuImage system bin : gawk : awk ;
+AddSymlinkToHaikuImage system bin : grep : egrep ;
+AddSymlinkToHaikuImage system bin : grep : fgrep ;
+AddSymlinkToHaikuImage system bin : vim : vi ;
+AddSymlinkToHaikuImage system bin : vim : view ;
 
 
 # scripts and data files
 local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript InstallerInitScript
 	InstallerFinishScript ;
 SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
-AddFilesToHaikuImage beos system boot : $(bootScripts) ;
+AddFilesToHaikuImage system boot : $(bootScripts) ;
 
 local userBootScripts = UserBootscript.sample UserSetupEnvironment.sample ;
 SEARCH on $(userBootScripts) = [ FDirName $(HAIKU_TOP) data config boot ] ;
@@ -309,25 +310,25 @@ AddFilesToHaikuImage home config boot : $(userBootScripts) ;
 local logoArtwork = "HAIKU logo - white on blue - big.png"
 	"HAIKU logo - white on blue - normal.png" ;
 SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
-AddFilesToHaikuImage beos etc artwork : $(logoArtwork) ;
+AddFilesToHaikuImage system data artwork : $(logoArtwork) ;
 
-AddDirectoryToHaikuImage beos etc sounds ;
+AddDirectoryToHaikuImage system data sounds ;
 
 # Mail spell check dictionaries
 local spellFiles = words geekspeak ;
 spellFiles = $(spellFiles:G=spell) ;
 SEARCH on $(spellFiles)
 	= [ FDirName $(HAIKU_TOP) src apps mail ] ;
-AddFilesToHaikuImage beos etc word_dictionary : $(spellFiles) ;
+AddFilesToHaikuImage system etc word_dictionary : $(spellFiles) ;
 
 local etcFiles = inputrc profile teapot.data ;
 etcFiles = $(etcFiles:G=etc) ;
 SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
 etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
-AddFilesToHaikuImage beos etc : $(etcFiles) ;
+AddFilesToHaikuImage system etc : $(etcFiles) ;
 
 SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
-AddFilesToHaikuImage beos etc vim : <etc>vimrc ;
+AddFilesToHaikuImage system etc vim : <etc>vimrc ;
 
 local fortuneFiles =  Art Computers Education Food Fortunes Goedel Haiku
 	Humorists Kids Law "Linux cookies" Love Magic Medicine Miscellaneous
@@ -335,37 +336,37 @@ local fortuneFiles =  Art Computers Education Food Fortunes Goedel Haiku
 	Sports "Tech Support Excuses" ;
 fortuneFiles = $(fortuneFiles:G=etc!fortunes) ;
 SEARCH on $(fortuneFiles) = [ FDirName $(HAIKU_TOP) data etc fortunes ] ;
-AddFilesToHaikuImage beos etc fortunes : $(fortuneFiles) ;
+AddFilesToHaikuImage system etc fortunes : $(fortuneFiles) ;
 
 local fontDir = [ FDirName $(HAIKU_TOP) data etc fonts ] ;
 local psFonts = [ Glob $(fontDir)/psfonts : *.afm *.pfb ] ;
 local ttFonts = [ Glob $(fontDir)/ttfonts : *.ttf ] ;
-AddFilesToHaikuImage beos etc fonts psfonts : $(psFonts) ;
-AddFilesToHaikuImage beos etc fonts ttfonts : $(ttFonts) ;
+AddFilesToHaikuImage system fonts psfonts : $(psFonts) ;
+AddFilesToHaikuImage system fonts ttfonts : $(ttFonts) ;
 
 local kanbeDir = [ FDirName $(HAIKU_TOP) data etc KanBe ] ;
 local kanbeDefault = [ Glob $(kanbeDir)/default : *.canna *.gz ] ;
 local kanbeDic = [ Glob $(kanbeDir)/dic : *.cbp ] ;
 local kanbeDicCanna = [ Glob $(kanbeDir)/dic/canna
 	: *.cld *.ctd *.cbd *.dir ] ;
-AddFilesToHaikuImage beos etc KanBe default : $(kanbeDefault) ;
-AddFilesToHaikuImage beos etc KanBe dic : $(kanbeDic) ;
-AddFilesToHaikuImage beos etc KanBe dic canna : $(kanbeDicCanna) ;
-AddDirectoryToHaikuImage beos etc KanBe dic group ;
-AddDirectoryToHaikuImage beos etc KanBe dic user ;
+AddFilesToHaikuImage system data KanBe default : $(kanbeDefault) ;
+AddFilesToHaikuImage system data KanBe dic : $(kanbeDic) ;
+AddFilesToHaikuImage system data KanBe dic canna : $(kanbeDicCanna) ;
+AddDirectoryToHaikuImage system data KanBe dic group ;
+AddDirectoryToHaikuImage system data KanBe dic user ;
 
 local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ]
 	: *.keymap ] ;
 keymapFiles = $(keymapFiles:BG=keymap) ;
-AddFilesToHaikuImage beos etc Keymap : $(keymapFiles) ;
-AddSymlinkToHaikuImage beos etc Keymap : Swedish : Finnish ;
-AddSymlinkToHaikuImage beos etc Keymap : Slovene : Croatian ;
-AddSymlinkToHaikuImage beos etc Keymap : US-International : Brazilian ;
+AddFilesToHaikuImage system data Keymaps : $(keymapFiles) ;
+AddSymlinkToHaikuImage system data Keymaps : Swedish : Finnish ;
+AddSymlinkToHaikuImage system data Keymaps : Slovene : Croatian ;
+AddSymlinkToHaikuImage system data Keymaps : US-International : Brazilian ;
 
 local timezones = [ FTimeZoneBinaries $(HAIKU_TIME_ZONE_SOURCES) : : true ] ;
 for timezone in $(timezones) {
 	local dir = [ on $(timezone) return $(RELATIVE_TIMEZONE_DIR) ] ;
-	AddFilesToHaikuImage beos etc timezones $(dir) : $(timezone) ;
+	AddFilesToHaikuImage system data timezones $(dir) : $(timezone) ;
 }
 
 local driverSettingsFiles = <driver-settings>kernel ;
@@ -390,7 +391,7 @@ AddFilesToHaikuImage common boot post_install : $(postInstallFiles) ;
 AddFilesToHaikuImage common settings : <post-install>fresh_install ;
 
 # boot loader
-AddFilesToHaikuImage beos system : zbeos ;
+AddFilesToHaikuImage system : haiku_loader ;
 
 # boot module links
 AddBootModuleSymlinksToHaikuImage
@@ -405,48 +406,48 @@ AddBootModuleSymlinksToHaikuImage
 ;
 
 # add-ons
-AddFilesToHaikuImage beos system add-ons accelerants
-	: $(BEOS_ADD_ONS_ACCELERANTS) ;
-AddFilesToHaikuImage beos system add-ons opengl
+AddFilesToHaikuImage system add-ons accelerants
+	: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
+AddFilesToHaikuImage system add-ons opengl
 	: $(X86_ONLY)Mesa\ Software\ Renderer ;
-AddFilesToHaikuImage beos system add-ons Translators
-	: $(BEOS_ADD_ONS_TRANSLATORS) ;
-AddFilesToHaikuImage beos system add-ons mail_daemon inbound_protocols : POP3 IMAP ;
-AddFilesToHaikuImage beos system add-ons mail_daemon outbound_protocols : SMTP ;
-AddFilesToHaikuImage beos system add-ons mail_daemon inbound_filters : Match\ Header Spam\ Filter R5\ Daemon\ Filter ;
-AddFilesToHaikuImage beos system add-ons mail_daemon outbound_filters : Fortune ;
-AddFilesToHaikuImage beos system add-ons mail_daemon system_filters : Inbox New\ Mail\ Notification Outbox Message\ Parser ;
-AddFilesToHaikuImage beos system add-ons media : $(BEOS_ADD_ONS_MEDIA) ;
-AddFilesToHaikuImage beos system add-ons media plugins
-	: $(BEOS_ADD_ONS_MEDIA_PLUGINS) ;
-AddFilesToHaikuImage beos system add-ons Tracker
+AddFilesToHaikuImage system add-ons Translators
+	: $(SYSTEM_ADD_ONS_TRANSLATORS) ;
+AddFilesToHaikuImage system add-ons mail_daemon inbound_protocols : POP3 IMAP ;
+AddFilesToHaikuImage system add-ons mail_daemon outbound_protocols : SMTP ;
+AddFilesToHaikuImage system add-ons mail_daemon inbound_filters : Match\ Header Spam\ Filter R5\ Daemon\ Filter ;
+AddFilesToHaikuImage system add-ons mail_daemon outbound_filters : Fortune ;
+AddFilesToHaikuImage system add-ons mail_daemon system_filters : Inbox New\ Mail\ Notification Outbox Message\ Parser ;
+AddFilesToHaikuImage system add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
+AddFilesToHaikuImage system add-ons media plugins
+	: $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
+AddFilesToHaikuImage system add-ons Tracker
 	: FileType-F ZipOMatic-Z Open\ Target\ Folder-T ;
-AddSymlinkToHaikuImage beos system add-ons Tracker
-	: /boot/beos/preferences/Backgrounds : Background-B ;
-AddSymlinkToHaikuImage beos system add-ons Tracker
-	: /boot/beos/apps/TextSearch : TextSearch-G ;
-AddSymlinkToHaikuImage beos system add-ons Tracker
-	: /boot/beos/apps/DiskUsage : DiskUsage-I ;
-AddFilesToHaikuImage beos system add-ons input_server devices
+AddSymlinkToHaikuImage system add-ons Tracker
+	: /boot/system/preferences/Backgrounds : Background-B ;
+AddSymlinkToHaikuImage system add-ons Tracker
+	: /boot/system/apps/TextSearch : TextSearch-G ;
+AddSymlinkToHaikuImage system add-ons Tracker
+	: /boot/system/apps/DiskUsage : DiskUsage-I ;
+AddFilesToHaikuImage system add-ons input_server devices
 	: <input>keyboard <input>mouse <input>wacom ;
-AddFilesToHaikuImage beos system add-ons input_server filters : screen_saver ;
-AddFilesToHaikuImage beos system add-ons kernel network
+AddFilesToHaikuImage system add-ons input_server filters : screen_saver ;
+AddFilesToHaikuImage system add-ons kernel network
 	: <net>notifications stack ;
-AddFilesToHaikuImage beos system add-ons kernel network devices
-	: $(BEOS_NETWORK_DEVICES) ;
-AddFilesToHaikuImage beos system add-ons kernel network datalink_protocols
-	: $(BEOS_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToHaikuImage beos system add-ons kernel network ppp
-	: $(BEOS_NETWORK_PPP) ;
-AddFilesToHaikuImage beos system add-ons kernel network protocols
-	: $(BEOS_NETWORK_PROTOCOLS) ;
-AddFilesToHaikuImage beos system add-ons Print : $(BEOS_ADD_ONS_PRINT) ;
-AddFilesToHaikuImage beos system add-ons Print transport
-	: $(BEOS_ADD_ONS_PRINT_TRANSPORT) ;
-AddFilesToHaikuImage beos system add-ons Screen\ Savers
-	: $(BEOS_ADD_ONS_SCREENSAVERS) ;
+AddFilesToHaikuImage system add-ons kernel network devices
+	: $(SYSTEM_NETWORK_DEVICES) ;
+AddFilesToHaikuImage system add-ons kernel network datalink_protocols
+	: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
+AddFilesToHaikuImage system add-ons kernel network ppp
+	: $(SYSTEM_NETWORK_PPP) ;
+AddFilesToHaikuImage system add-ons kernel network protocols
+	: $(SYSTEM_NETWORK_PROTOCOLS) ;
+AddFilesToHaikuImage system add-ons Print : $(SYSTEM_ADD_ONS_PRINT) ;
+AddFilesToHaikuImage system add-ons Print transport
+	: $(SYSTEM_ADD_ONS_PRINT_TRANSPORT) ;
+AddFilesToHaikuImage system add-ons Screen\ Savers
+	: $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
 
-AddFilesToHaikuImage beos system add-ons disk_systems
+AddFilesToHaikuImage system add-ons disk_systems
 	: <disk_system>intel <disk_system>bfs ;
 
 # create directories that will remain empty
@@ -469,11 +470,11 @@ AddDirectoryToHaikuImage home config add-ons input_server methods ;
 AddDirectoryToHaikuImage home config add-ons Tracker ;
 AddDirectoryToHaikuImage home config add-ons Screen\ Savers ;
 AddDirectoryToHaikuImage home config add-ons Translators ;
-AddDirectoryToHaikuImage beos etc synth ;
-AddDirectoryToHaikuImage beos system add-ons input_server methods ;
+AddDirectoryToHaikuImage system data synth ;
+AddDirectoryToHaikuImage system add-ons input_server methods ;
 
 # optional
-AddFilesToHaikuImage optional beos system add-ons input_server methods : canna ;
+AddFilesToHaikuImage optional system add-ons input_server methods : canna ;
 
 # printers
 AddDirectoryToHaikuImage home config settings printers Preview
@@ -482,7 +483,7 @@ AddDirectoryToHaikuImage home config settings printers "Save as PDF"
       : home-config-settings-printers-save-as-pdf.rdef ;
 
 # licenses
-CopyDirectoryToHaikuImage beos etc
+CopyDirectoryToHaikuImage system data
 	: [ FDirName $(HAIKU_TOP) data etc licenses ]
 	: licenses : -x .svn ;
 
@@ -512,14 +513,14 @@ MakeLocate $(alternativeSystemLibsZip) : $(HAIKU_OUTPUT_DIR) ;
 
 # collect the targets we would install in the lib directory
 local alternativeSystemLibs ;
-local libTargets = [ FFilesInHaikuImageDirectory beos system lib ] ;
+local libTargets = [ FFilesInHaikuImageDirectory system lib ] ;
 local libTarget ;
 for libTarget in $(libTargets) {
 	alternativeSystemLibs += [ on $(libTarget) return $(TARGET) ] ;
 }
 
 # collect the symlinks we would install in the lib directory
-libTargets = [ FSymlinksInHaikuImageDirectory beos system lib ] ;
+libTargets = [ FSymlinksInHaikuImageDirectory system lib ] ;
 local tmpAlternativeLibDir
 	= [ FDirName $(HAIKU_OUTPUT_DIR) tmp alternativeLibs ] ;
 for libTarget in $(libTargets) {
@@ -567,7 +568,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 	}
 
 	# install the alternative libs in the right directory
-	UnzipArchiveToHaikuImage beos system lib $(libSubDir)
+	UnzipArchiveToHaikuImage system lib $(libSubDir)
 		: $(otherAlternativeSystemLibsZip) ;
 }
 

build/jam/ImageRules

@@ -288,10 +288,10 @@ rule AddDriversToContainer container : relativeDirectoryTokens : targets
 {
 	# AddDriversToContainer <container> : <relative directory> : <targets> ;
 	#
-	local directoryTokens = beos system add-ons kernel drivers dev
+	local directoryTokens = system add-ons kernel drivers dev
 		$(relativeDirectoryTokens) ;
 
-	AddFilesToContainer $(container) : beos system add-ons kernel drivers bin
+	AddFilesToContainer $(container) : system add-ons kernel drivers bin
 		: $(targets) ;
 
 	# If the image shall only be updated, we don't add any symlinks.
@@ -320,7 +320,7 @@ rule AddNewDriversToContainer container : relativeDirectoryTokens
 {
 	# AddNewDriversToContainer <container> : <directory> : <targets> ;
 	#
-	local directoryTokens = beos system add-ons kernel drivers
+	local directoryTokens = system add-ons kernel drivers
 		$(relativeDirectoryTokens) ;
 
 	AddFilesToContainer $(container) : $(directoryTokens)
@@ -356,7 +356,7 @@ rule AddBootModuleSymlinksToContainer container : targets
 		local name = $(target:BS) ;
 		local linkTarget = [ FDirName /boot $(installDir:G=) $(name) ] ;
 
-		AddSymlinkToContainer $(container) : beos system add-ons kernel boot
+		AddSymlinkToContainer $(container) : system add-ons kernel boot
 			: $(linkTarget) : $(name) ;
 	}
 }
@@ -751,7 +751,7 @@ rule AddEntryToHaikuImageUserGroupFile file : entry
 		Always $(file) ;
 		MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
 		BuildHaikuImageUserGroupFile $(file) ;
-		AddFilesToHaikuImage beos etc : $(file) ;
+		AddFilesToHaikuImage system etc : $(file) ;
 	}
 
 	HAIKU_IMAGE_USER_GROUP_ENTRIES on $(file) = $(allEntries) ;
@@ -805,7 +805,7 @@ rule AddLicenseToHaikuImage file : name : searchPath
 		name = ;
 	}
 
-	AddFilesToHaikuImage beos etc licenses : $(file) : $(name) ;
+	AddFilesToHaikuImage system data licenses : $(file) : $(name) ;
 }
 
 
@@ -1053,9 +1053,9 @@ actions BuildFloppyBootArchive1
 
 # warning: that is quite x86 dependant...
 
-rule BuildFloppyBootImage image : zbeos : archive
+rule BuildFloppyBootImage image : haikuLoader : archive
 {
-	Depends $(image) : $(zbeos) ;
+	Depends $(image) : $(haikuLoader) ;
 	Depends $(image) : $(archive) ;
 	#MakeLocateDebug $(image) ;
 	ARCHIVE_IMAGE_OFFSET on $(image) = $(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ;
@@ -1067,7 +1067,7 @@ rule BuildFloppyBootImage image : zbeos : archive
 		FLOPPY_IMAGE_BLOCK_SIZE on $(image) = 2 ;
 	}
 
-	BuildFloppyBootImage1 $(image) : $(zbeos) $(archive) ;
+	BuildFloppyBootImage1 $(image) : $(haikuLoader) $(archive) ;
 }
 
 actions BuildFloppyBootImage1
@@ -1075,11 +1075,9 @@ actions BuildFloppyBootImage1
 	$(RM) $(<)
 	# make an empty image
 	dd if=/dev/zero of=$(<) bs=$(FLOPPY_IMAGE_BLOCK_SIZE)k count=1440
-	# add zbeos
+	# add haiku_loader
 	dd if=$(>[1]) of=$(<) conv=notrunc
 	# add the boot drivers tgz archive
-	# keep the offset in sync with
-	# src/system/boot/loader/file_systems/tarfs/tarfs.cpp:kFloppyArchiveOffset
 	dd if=$(>[2]) of=$(<) bs=$(ARCHIVE_IMAGE_OFFSET)k seek=1 conv=notrunc
 }
 

build/jam/OptionalPackages

@@ -102,10 +102,10 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] {
 if [ IsOptionalHaikuImagePackageAdded BeBook ] {
 	InstallOptionalHaikuImagePackage bebook_20081026
 		: http://haiku-files.org/files/optional-packages/bebook_20081026.zip
-		: beos documentation
+		: system documentation
 	;
 	AddSymlinkToHaikuImage home Desktop
-		: /boot/beos/documentation/bebook/index.html : BeBook ;
+		: /boot/system/documentation/bebook/index.html : BeBook ;
 }
 
 
@@ -147,14 +147,15 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
 if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
 	local bluetoothDrivers = h2generic ;
 	AddDriversToHaikuImage bluetooth : $(bluetoothDrivers) ;
-	AddFilesToHaikuImage beos system servers : bluetooth_server ;
-	AddFilesToHaikuImage beos system lib : libbluetooth.so ;
-	AddFilesToHaikuImage beos system add-ons kernel network devices : bluetooth ;
-	AddFilesToHaikuImage beos system add-ons kernel network protocols : l2cap ;
-	AddFilesToHaikuImage beos system add-ons kernel bluetooth : btCoreData ;
-	AddFilesToHaikuImage beos preferences : Bluetooth ;
-	AddFilesToHaikuImage beos bin : bt_dev_info bt_discovery ;
-	AddSymlinkToHaikuImage home config be Preferences : /boot/beos/preferences/Bluetooth ;
+	AddFilesToHaikuImage system servers : bluetooth_server ;
+	AddFilesToHaikuImage system lib : libbluetooth.so ;
+	AddFilesToHaikuImage system add-ons kernel network devices : bluetooth ;
+	AddFilesToHaikuImage system add-ons kernel network protocols : l2cap ;
+	AddFilesToHaikuImage system add-ons kernel bluetooth : btCoreData ;
+	AddFilesToHaikuImage system preferences : Bluetooth ;
+	AddFilesToHaikuImage system bin : bt_dev_info bt_discovery ;
+	AddSymlinkToHaikuImage home config be Preferences
+		: /boot/system/preferences/Bluetooth ;
 	if [ IsOptionalHaikuImagePackageAdded Development ] {
 		AddSymlinkToHaikuImage develop lib x86 : /system/lib/libbluetooth.so ;
 	}
@@ -198,12 +199,12 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
 	AddFilesToHaikuImage develop lib x86 : libposix_error_mapper.a ;
 
 	# cc and c++ wrapper scripts
-	AddFilesToHaikuImage beos bin : cc c++ ;
+	AddFilesToHaikuImage system bin : cc c++ ;
 
 	# mkdepend build tool, which is part of the Haiku source tree
 	# (same as make, but make is already included independent of the
 	# Development package)
-	AddFilesToHaikuImage beos bin : mkdepend ;
+	AddFilesToHaikuImage system bin : mkdepend ;
 
 	# skeleton makefile and makefile-engine
 	local makefileEngineFiles =
@@ -520,10 +521,10 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] {
 # UserlandFS
 if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
 	# kernel module
-	AddFilesToHaikuImage beos system add-ons kernel file_systems : userlandfs ;
+	AddFilesToHaikuImage system add-ons kernel file_systems : userlandfs ;
 
 	# server
-	AddFilesToHaikuImage beos system servers : userlandfs_server ;
+	AddFilesToHaikuImage system servers : userlandfs_server ;
 
 	# libs
 	local userlandfsLibs =
@@ -531,7 +532,7 @@ if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
 		libuserlandfs_haiku_kernel.so
 		libuserlandfs_fuse.so
 	;
-	AddFilesToHaikuImage beos system lib : $(userlandfsLibs) ;
+	AddFilesToHaikuImage system lib : $(userlandfsLibs) ;
 
 	# development goodies
 	if [ IsOptionalHaikuImagePackageAdded Development ] {
@@ -602,17 +603,17 @@ if [ IsOptionalHaikuImagePackageAdded VLC ] {
 
 # Welcome
 if [ IsOptionalHaikuImagePackageAdded Welcome ] {
-	CopyDirectoryToHaikuImage beos documentation
+	CopyDirectoryToHaikuImage system documentation
 		: [ FDirName $(HAIKU_TOP) docs welcome ]
 		: welcome : -x .svn ;
-	CopyDirectoryToHaikuImage beos documentation
+	CopyDirectoryToHaikuImage system documentation
 		: [ FDirName $(HAIKU_TOP) docs userguide ]
 		: userguide : -x .svn ;
-	AddFilesToHaikuImage beos documentation
+	AddFilesToHaikuImage system documentation
 		: [ FDirName $(HAIKU_TOP) docs Haiku-doc.css ]
 		: Haiku-doc.css ;
 	AddSymlinkToHaikuImage home Desktop
-		: /boot/beos/documentation/welcome/welcome.html : Welcome ;
+		: /boot/system/documentation/welcome/welcome.html : Welcome ;
 }
 
 

build/jam/UserBuildConfig.ReadMe

@@ -83,17 +83,17 @@ SetUpdateHaikuImageOnly 1 ;
 # has been added, like for "kernel").
 HAIKU_INCLUDE_IN_IMAGE on libbe.so kernel = 1 ;
 
-# Add "crashing_app" to the beos/bin directory of the Haiku image/installation.
+# Add "crashing_app" to the system/bin directory of the Haiku image/installation.
 # Note, that this also makes the image depend on the target, i.e. it is
 # automatically updated when the image is built.
-AddFilesToHaikuImage beos bin : crashing_app ;
+AddFilesToHaikuImage system bin : crashing_app ;
 
 # Make a symlink to home/config/bin/crash.
-AddSymlinkToHaikuImage home config bin : /beos/bin/crashing_app : crash ;
+AddSymlinkToHaikuImage home config bin : /bin/crashing_app : crash ;
 
 # Add timezone and keymap settings.
 AddSymlinkToHaikuImage home config settings
-	: /boot/beos/etc/timezones/Europe/Paris : timezone ;
+	: /boot/system/data/timezones/Europe/Paris : timezone ;
 AddFilesToHaikuImage home config settings : <keymap>US-International : Key_map ;
 
 # Adds the source directories src/kits/storage and src/tests/servers/debug

build/jam/UserBuildConfig.sample

@@ -8,7 +8,7 @@
 #HAIKU_INSTALL_DIR = /Haiku ;
 
 # Install Haiku on device /dev/sda57. Be sure you know what you're doing!
-#HAIKU_IMAGE_DIR		= /dev ;
+#HAIKU_IMAGE_DIR	= /dev ;
 #HAIKU_IMAGE_NAME	= sda57 ;
 #HAIKU_DONT_CLEAR_IMAGE = 1 ;
 
@@ -19,7 +19,7 @@
 
 # Add symlink/file (timezone and keymap settings) to the image.
 #AddSymlinkToHaikuImage home config settings
-#	: /boot/beos/etc/timezones/Europe/Paris : timezone ;
+#	: /boot/system/data/timezones/Europe/Paris : timezone ;
 #AddFilesToHaikuImage home config settings : <keymap>US-International
 #	: Key_map ;
 

build/scripts/build_haiku_cd

@@ -135,7 +135,7 @@ if [ -f $copyrightsFile ]; then
 	$rmAttrs -f $copyrightAttrs
 	touch $copyrightAttrs
 	$addattr -f $copyrightsFile COPYRIGHTS $copyrightAttrs
-	$copyAttrs $copyrightAttrs ${tPrefix}beos/apps/AboutSystem
+	$copyAttrs $copyrightAttrs ${tPrefix}system/apps/AboutSystem
 fi
 
 # generate the attribute stores

build/scripts/build_haiku_image

@@ -207,7 +207,7 @@ if [ ! $updateOnly ]; then
 		$rmAttrs -f $copyrightAttrs
 		touch $copyrightAttrs
 		$addattr -f $copyrightsFile COPYRIGHTS $copyrightAttrs
-		$copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}beos/apps/AboutSystem
+		$copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}system/apps/AboutSystem
 	fi
 fi
 

data/system/boot/Bootscript

@@ -54,13 +54,13 @@ exec </dev/null
 exec >/dev/null 2>&1
 
 # Standard locations of boot files
-SCRIPTS=beos/system/boot
-SERVERS=beos/system/servers
+SCRIPTS=system/boot
+SERVERS=system/servers
 
 # clean the shared memory dir
 shmDir=/boot/var/shared_memory
 rm -rf $shmDir
-mkdir $shmDir
+mkdir -p $shmDir
 chmod 777 $shmDir
 
 # Set up the environment
@@ -77,7 +77,7 @@ if [ "$iw" = "yes" ]; then
 fi
 
 # Sets timezone etc.
-runprog beos/bin/clockconfig
+runprog system/bin/clockconfig
 
 # Launch servers
 
@@ -105,18 +105,18 @@ fi
 # Launch Terminal or consoled depending on $SAFEMODE
 if [ "$SAFEMODE" != "yes" ]; then
 	if [ -e /etc/users ]; then
-		launch beos/system/Login
+		launch system/Login
 		# nothing more
 	else
-		launch beos/system/Tracker
-		launch beos/system/Deskbar
+		launch system/Tracker
+		launch system/Deskbar
 
 		# install ProcessController in the deskbar
-		(sleep 7; /boot/beos/apps/ProcessController -deskbar) &
+		(sleep 7; /boot/system/apps/ProcessController -deskbar) &
 	fi
-	launch beos/apps/Terminal
+	launch system/apps/Terminal
 else
-	launch beos/bin/consoled
+	launch system/bin/consoled
 fi
 
 if [ "$SAFEMODE" != "yes" ]; then
@@ -135,7 +135,7 @@ if [ "$SAFEMODE" != "yes" ]; then
 fi
 
 # Check for daily saving time
-launch beos/bin/dstcheck
+launch system/bin/dstcheck
 
 if [ "$SAFEMODE" != "yes" ]; then
 	# Start user boot script

data/system/boot/Bootscript.cd

@@ -72,15 +72,15 @@ fi
 
 # Launch Terminal or consoled depending on $SAFEMODE
 if [ "$SAFEMODE" != "yes" ]; then
-	if [ -x /boot/beos/apps/Installer ]; then
-		/boot/beos/apps/Installer
-		#/boot/beos/apps/Terminal -x /boot/beos/apps/Installer
+	if [ -x /boot/system/apps/Installer ]; then
+		/boot/system/apps/Installer
+		#/boot/system/apps/Terminal -x /boot/system/apps/Installer
 	else
-		/boot/beos/apps/Terminal
+		/boot/system/apps/Terminal
 	fi
-	#launch beos/apps/Terminal
+	#launch system/apps/Terminal
 else
-	launch beos/bin/consoled
+	launch system/bin/consoled
 fi
 
 # sync disks

data/system/boot/SetupEnvironment

@@ -42,13 +42,13 @@ export BE_DEFAULT_CPLUS_FLAGS=""
 
 if [ "$SAFEMODE" != "yes" ]
 then
-	export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
-	export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/beos/system/lib"
-	export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/beos/system/add-ons"
+	export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:$BETOOLS
+	export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/system/lib"
+	export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/system/add-ons"
 else
-	export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
-	export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/beos/system/lib"
-	export ADDON_PATH="%A/add-ons:/boot/beos/system/add-ons"
+	export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:$BETOOLS
+	export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/system/lib"
+	export ADDON_PATH="%A/add-ons:/boot/system/add-ons"
 fi
 
 # media kit

headers/os/storage/FindDirectory.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008, Haiku Inc. All Rights Reserved.
+ * Copyright 2002-2009, Haiku Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _FIND_DIRECTORY_H
@@ -15,22 +15,21 @@ typedef enum {
 	B_TRASH_DIRECTORY,
 
 	/* System directories */
-	B_BEOS_DIRECTORY				= 1000,
-	B_BEOS_SYSTEM_DIRECTORY,
-	B_BEOS_ADDONS_DIRECTORY,
-	B_BEOS_BOOT_DIRECTORY,
-	B_BEOS_FONTS_DIRECTORY,
-	B_BEOS_LIB_DIRECTORY,
- 	B_BEOS_SERVERS_DIRECTORY,
-	B_BEOS_APPS_DIRECTORY,
-	B_BEOS_BIN_DIRECTORY,
-	B_BEOS_ETC_DIRECTORY,
-	B_BEOS_DOCUMENTATION_DIRECTORY,
-	B_BEOS_PREFERENCES_DIRECTORY,
-	B_BEOS_TRANSLATORS_DIRECTORY,
-	B_BEOS_MEDIA_NODES_DIRECTORY,
-	B_BEOS_SOUNDS_DIRECTORY,
-	B_BEOS_DATA_DIRECTORY,
+	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_PREFERENCES_DIRECTORY,
+	B_SYSTEM_TRANSLATORS_DIRECTORY,
+	B_SYSTEM_MEDIA_NODES_DIRECTORY,
+	B_SYSTEM_SOUNDS_DIRECTORY,
+	B_SYSTEM_DATA_DIRECTORY,
 
 	/* Common directories, shared among all users. */
 	B_COMMON_DIRECTORY				= 2000,
@@ -54,7 +53,6 @@ typedef enum {
 	B_COMMON_SOUNDS_DIRECTORY,
 	B_COMMON_DATA_DIRECTORY,
 
-
 	/* User directories. These are interpreted in the context
 	   of the user making the find_directory call. */
 	B_USER_DIRECTORY				= 3000,
@@ -75,8 +73,25 @@ typedef enum {
 	/* Global directories. */
 	B_APPS_DIRECTORY				= 4000,
 	B_PREFERENCES_DIRECTORY,
-	B_UTILITIES_DIRECTORY
+	B_UTILITIES_DIRECTORY,
 
+	/* Obsolete: Legacy BeOS definition to be phased out */
+	B_BEOS_DIRECTORY				= 1000,
+	B_BEOS_SYSTEM_DIRECTORY,
+	B_BEOS_ADDONS_DIRECTORY,
+	B_BEOS_BOOT_DIRECTORY,
+	B_BEOS_FONTS_DIRECTORY,
+	B_BEOS_LIB_DIRECTORY,
+ 	B_BEOS_SERVERS_DIRECTORY,
+	B_BEOS_APPS_DIRECTORY,
+	B_BEOS_BIN_DIRECTORY,
+	B_BEOS_ETC_DIRECTORY,
+	B_BEOS_DOCUMENTATION_DIRECTORY,
+	B_BEOS_PREFERENCES_DIRECTORY,
+	B_BEOS_TRANSLATORS_DIRECTORY,
+	B_BEOS_MEDIA_NODES_DIRECTORY,
+	B_BEOS_SOUNDS_DIRECTORY,
+	B_BEOS_DATA_DIRECTORY,
 } directory_which;
 
 #ifdef __cplusplus

src/apps/aboutsystem/AboutSystem.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2008, Haiku, Inc.
+ * Copyright (c) 2005-2009, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
  * Authors:
@@ -67,50 +67,54 @@ static const rgb_color kLinkBlue = { 80, 80, 200, 255 };
 
 class AboutApp : public BApplication {
 	public:
-		AboutApp(void);
+								AboutApp();
 };
 
 class AboutWindow : public BWindow {
 	public:
-				AboutWindow(void);
-		bool	QuitRequested(void);
+								AboutWindow();
+
+		virtual	bool			QuitRequested();
 };
 
 class AboutView : public BView {
 	public:
-				AboutView(const BRect &r);
-				~AboutView(void);
+								AboutView(const BRect& frame);
+								~AboutView();
 
-		virtual void AttachedToWindow();
-		virtual void Pulse();
+		virtual void			AttachedToWindow();
+		virtual void			Pulse();
 
-		virtual void FrameResized(float width, float height);
-		virtual void Draw(BRect update);
-		virtual void MessageReceived(BMessage *msg);
-		virtual void MouseDown(BPoint pt);
+		virtual void			FrameResized(float width, float height);
+		virtual void			Draw(BRect updateRect);
+		virtual void			MessageReceived(BMessage* msg);
+		virtual void			MouseDown(BPoint point);
 
-		void	AddCopyrightEntry(const char *name, const char *text,
-					const Licenses& licenses, const char *url);
-		void	AddCopyrightEntry(const char *name, const char *text,
-					const char *url = NULL);
-		void	AddCopyrightEntry(const BMessage& packageDescription);
-		void	PickRandomHaiku();
+				void			AddCopyrightEntry(const char* name,
+									const char* text, const Licenses& licenses,
+									const char* url);
+				void			AddCopyrightEntry(const char* name,
+									const char* text, const char* url = NULL);
+				void			AddCopyrightEntry(
+									const BMessage& packageDescription);
+				void			PickRandomHaiku();
 
 	private:
-		void	_AddCopyrightsFromAttribute();
+				status_t		_GetLicensesPath(BPath& path);
+				void			_AddCopyrightsFromAttribute();
 
-		BStringView		*fMemView;
-		BTextView		*fUptimeView;
-		BView			*fInfoView;
-		HyperTextView	*fCreditsView;
+				BStringView*	fMemView;
+				BTextView*		fUptimeView;
+				BView*			fInfoView;
+				HyperTextView*	fCreditsView;
 
-		BBitmap			*fLogo;
+				BBitmap*		fLogo;
 
-		BPoint			fDrawPoint;
+				BPoint			fDrawPoint;
 
-		bigtime_t		fLastActionTime;
-		BMessageRunner	*fScrollRunner;
-		BQuery			fAppsQuery;
+				bigtime_t		fLastActionTime;
+				BMessageRunner*	fScrollRunner;
+				BQuery			fAppsQuery;
 };
 
 
@@ -548,7 +552,6 @@ AboutView::AboutView(const BRect &rect)
 		"(sorry!)"
 		"\n\n");
 
-
 	fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
 	fCreditsView->Insert("Special Thanks To:\n");
 
@@ -558,6 +561,12 @@ AboutView::AboutView(const BRect &rect)
 
 	// copyrights for various projects we use
 
+	BPath licensesPath;
+	_GetLicensesPath(licensesPath);
+
+	BPath mitPath(licensesPath);
+	mitPath.Append("MIT license");
+
 	font.SetSize(be_bold_font->Size() + 4);
 	font.SetFace(B_BOLD_FACE);
 	fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuGreen);
@@ -572,7 +581,7 @@ AboutView::AboutView(const BRect &rect)
 		"kernel and all code that applications may link against, is "
 		"distributed under the terms of the ");
 	fCreditsView->InsertHyperText("MIT license",
-		new OpenFileAction("/etc/licenses/MIT"));
+		new OpenFileAction(mitPath.Path()));
 	fCreditsView->Insert(". Some system libraries contain third party code "
 		"distributed under the LGPL license. You can find the copyrights "
 		"to third party code below.\n\n");
@@ -997,6 +1006,9 @@ AboutView::AddCopyrightEntry(const char *name, const char *text,
 	fCreditsView->Insert(text);
 	fCreditsView->Insert("\n");
 
+	BPath licensesPath;
+	_GetLicensesPath(licensesPath);
+
 	if (licenses.CountLicenses() > 0) {
 		if (licenses.CountLicenses() > 1)
 			fCreditsView->Insert("Licenses: ");
@@ -1005,7 +1017,7 @@ AboutView::AddCopyrightEntry(const char *name, const char *text,
 
 		for (int32 i = 0; i < licenses.CountLicenses(); i++) {
 			const char* license = licenses.LicenseAt(i);
-			BString licensePath("/etc/licenses/");
+			BString licensePath(licensesPath.Path());
 			licensePath += license;
 
 			if (i > 0)
@@ -1102,6 +1114,17 @@ AboutView::PickRandomHaiku()
 }
 
 
+status_t
+AboutView::_GetLicensesPath(BPath& path)
+{
+	status_t status = find_directory(B_SYSTEM_DATA_DIRECTORY, &path);
+	if (status != B_OK)
+		return status;
+
+	return path.Append("licenses");
+}
+
+
 void
 AboutView::_AddCopyrightsFromAttribute()
 {

src/apps/processcontroller/PCWorld.cpp

@@ -150,7 +150,7 @@ PCApplication::ArgvReceived(int32 argc, char **argv)
 			} while (be_roster->IsRunning(kTrackerSig) && k-- > 0);
 		}
 		remove("/boot/home/config/settings/Tracker/tracker_shelf");
-		launch(kTrackerSig, "/boot/beos/system/Tracker");
+		launch(kTrackerSig, "/boot/system/Tracker");
 	} else if (argc == 2 && strcmp(argv[1], "-deskbar") == 0) {
 		BDeskbar deskbar;
 		if (!gInDeskbar && !deskbar.HasItem(kDeskbarItemName))

src/apps/processcontroller/ProcessController.cpp

@@ -311,21 +311,21 @@ ProcessController::MessageReceived(BMessage *message)
 			break;
 
 		case 'Trac':
-			launch(kTrackerSig, "/boot/beos/system/Tracker");
+			launch(kTrackerSig, "/boot/system/Tracker");
 			break;
 
 		case 'Dbar':
-			launch(kDeskbarSig, "/boot/beos/system/Deskbar");
+			launch(kDeskbarSig, "/boot/system/Deskbar");
 			break;
 
 		case 'Term':
-			launch(kTerminalSig, "/boot/beos/apps/Terminal");
+			launch(kTerminalSig, "/boot/system/apps/Terminal");
 			break;
 
 		case 'AlDb':
 		{
 			if (!be_roster->IsRunning(kDeskbarSig))
-				launch(kDeskbarSig, "/boot/beos/system/Deskbar");
+				launch(kDeskbarSig, "/boot/system/Deskbar");
 			BDeskbar deskbar;
 			if (gInDeskbar || deskbar.HasItem (kDeskbarItemName))
 				deskbar.RemoveItem (kDeskbarItemName);

src/bin/bash/config-top.h

@@ -52,7 +52,7 @@
 /* The default value of the PATH variable. */
 #ifndef DEFAULT_PATH_VALUE
 #define DEFAULT_PATH_VALUE \
-  ".:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:/boot/develop/bin"
+  ".:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:/boot/develop/bin"
 #endif
 
 /* The value for PATH when invoking `command -p'.  This is only used when

src/bin/gdb/gdb/Jamfile

@@ -12,7 +12,7 @@ SubDirSysHdrs [ FDirName $(HAIKU_TOP) src bin gawk intl ] ;
 	# all interested apps can link against.
 UsePrivateHeaders debug ;
 
-SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR=\\\"/boot/beos/etc/locale\\\"
+SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR=\\\"/etc/locale\\\"
 	-DMI_OUT=1 ;
 
 # filter warnings we don't want here

src/bin/grep/src/Jamfile

@@ -4,7 +4,7 @@ SubDir HAIKU_TOP src bin grep src ;
 TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
 	: -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR='\"/boot/beos/share/locale\"' ;
+SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR='\"/etc/locale\"' ;
 
 SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;

src/bin/make/config.h

@@ -2,7 +2,7 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
-#define LOCALEDIR	"/boot/beos/etc/local/"
+#define LOCALEDIR	"/etc/local/"
 #define LIBDIR		"/boot/develop/lib/"
 #define INCLUDEDIR	"/boot/develop/headers/"
 

src/bin/vim/src/gui_beos.cc

@@ -2730,7 +2730,7 @@ gui_mch_get_color(
 	char	line[LINE_LEN];
 	char_u	*fname;
 
-	fname = expand_env_save((char_u *)"/boot/beos/etc/rgb.txt");
+	fname = expand_env_save((char_u *)"/etc/rgb.txt");
 	if (fname == NULL)
 	    return INVALCOLOR;
 

src/kits/tracker/FSUtils.cpp

@@ -458,7 +458,7 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry, const char *action,
 	if (confirmedAlready && *confirmedAlready == kConfirmedAll)
 		return true;
 
-	if (!DirectoryMatchesOrContains(entry, B_BEOS_DIRECTORY)
+	if (!DirectoryMatchesOrContains(entry, B_SYSTEM_DIRECTORY)
 		&& !DirectoryMatchesOrContains(entry, B_USER_DIRECTORY))
 		// quick way out
 		return true;
@@ -467,14 +467,16 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry, const char *action,
 	bool requireOverride = true;
 
 	if (DirectoryMatches(entry, B_BEOS_DIRECTORY))
-		warning = "If you %s the beos folder, you won't be able to "
+		warning = "If you %s the system folder, you won't be able to "
 			"boot " OS_NAME "! Are you sure you want to do this? To %s the folder "
 			"anyway, hold down the Shift key and click \"Do it\".";
+#ifndef __HAIKU__
 	else if (DirectoryMatchesOrContains(entry, B_BEOS_SYSTEM_DIRECTORY))
 		warning = "If you %s the system folder or its contents, you "
 			"won't be able to boot " OS_NAME "! Are you sure you want to do this? "
 			"To %s the system folder or its contents anyway, hold down "
 			"the Shift key and click \"Do it\".";
+#endif
 	else if (DirectoryMatches(entry, B_USER_DIRECTORY)) {
 		warning = "If you %s the home folder, " OS_NAME " may not "
 			"behave properly! Are you sure you want to do this? "
@@ -2292,20 +2294,6 @@ FSIsDeskDir(const BEntry *entry)
 }
 
 
-bool
-FSIsSystemDir(const BEntry *entry)
-{
-	return FSIsDirFlavor(entry, B_BEOS_SYSTEM_DIRECTORY);
-}
-
-
-bool
-FSIsBeOSDir(const BEntry *entry)
-{
-	return FSIsDirFlavor(entry, B_BEOS_DIRECTORY);
-}
-
-
 bool
 FSIsHomeDir(const BEntry *entry)
 {
@@ -3475,10 +3463,14 @@ WellKnowEntryList::AddOne(directory_which which, const char *path, const char *n
 
 WellKnowEntryList::WellKnowEntryList()
 {
+#ifdef __HAIKU__
+	AddOne(B_SYSTEM_DIRECTORY, "system");
+#else
 	AddOne(B_BEOS_DIRECTORY, "beos");
+	AddOne(B_BEOS_SYSTEM_DIRECTORY, "system");
+#endif
 	AddOne((directory_which)B_BOOT_DISK, "/boot", "boot");
 	AddOne(B_USER_DIRECTORY, "home");
-	AddOne(B_BEOS_SYSTEM_DIRECTORY, "system");
 
 	AddOne(B_BEOS_FONTS_DIRECTORY, "fonts");
 	AddOne(B_COMMON_FONTS_DIRECTORY, "fonts");

src/kits/tracker/FSUtils.h

@@ -157,8 +157,6 @@ _IMPEXP_TRACKER void FSMakeOriginalName(char *name, BDirectory *destDir, const c
 _IMPEXP_TRACKER bool FSIsTrashDir(const BEntry *);
 _IMPEXP_TRACKER bool FSIsPrintersDir(const BEntry *);
 _IMPEXP_TRACKER bool FSIsDeskDir(const BEntry *);
-_IMPEXP_TRACKER bool FSIsSystemDir(const BEntry *);
-_IMPEXP_TRACKER bool FSIsBeOSDir(const BEntry *);
 _IMPEXP_TRACKER bool FSIsHomeDir(const BEntry *);
 _IMPEXP_TRACKER void FSMoveToTrash(BObjectList<entry_ref> *srcList, BList *pointList = NULL,
 	bool async = true);

src/preferences/joysticks/JoyWin.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Haiku.
+ * Copyright 2007-2009 Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -41,7 +41,7 @@
 #include <Joystick.h>
 
 #define JOYSTICKPATH "/dev/joystick/"
-#define JOYSTICKFILEPATH "/boot/beos/etc/joysticks/"
+#define JOYSTICKFILEPATH "/boot/system/data/joysticks/"
 #define JOYSTICKFILESETTINGS "/boot/home/config/settings/joysticks/"
 #define SELECTGAMEPORTFIRST "Select a game port first"
 

src/preferences/keymap/KeymapWindow.cpp

@@ -538,11 +538,12 @@ KeymapWindow::_FillSystemMaps()
 	while ((item = fSystemListView->RemoveItem(static_cast<int32>(0))))
 		delete item;
 
+	// TODO: common keymaps!
 	BPath path;
-	if (find_directory(B_BEOS_ETC_DIRECTORY, &path) != B_OK)
+	if (find_directory(B_SYSTEM_DATA_DIRECTORY, &path) != B_OK)
 		return;
 
-	path.Append("Keymap");
+	path.Append("Keymaps");
 
 	BDirectory directory;
 	entry_ref ref;

src/preferences/time/ZoneView.cpp

@@ -9,21 +9,14 @@
  */
 
 /*
-		Exceptions:
-			doesn't calc "Time in" time.
-
-		Issues:
-			After experimenting with both Time Prefs, it seems the original
-			doesn't use the link file in the users settings file to get the
-			current Timezone. Need to find the call it uses to get its
-			inital info so I can get exact duplication.
+	Exceptions:
+		doesn't calc "Time in" time.
 */
 
 #include "ZoneView.h"
-#include "TimeMessages.h"
-#include "TZDisplay.h"
-#include "TimeWindow.h"
 
+#include <stdio.h>
+#include <stdlib.h>
 
 #include <Button.h>
 #include <Directory.h>
@@ -41,9 +34,11 @@
 #include <View.h>
 #include <Window.h>
 
+#include <syscalls.h>
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "TimeMessages.h"
+#include "TZDisplay.h"
+#include "TimeWindow.h"
 
 
 class TZoneItem : public BStringItem {
@@ -83,14 +78,14 @@ TimeZoneView::_Revert()
 	BPath parent;
 
 	fCurrentZone = fOldZone;
-	int32 czone;
+	int32 czone = 0;
 
-	if (strcmp(fCurrentZone.Leaf(), "Greenwich") == 0) {
+	if (fCurrentZone.Leaf() != NULL
+		&& strcmp(fCurrentZone.Leaf(), "Greenwich") == 0) {
 		if (BMenuItem* item = fRegionPopUp->FindItem("Others"))
 			item->SetMarked(true);
 		czone = FillCityList("Others");
-	} else {
-		fCurrentZone.GetParent(&parent);
+	} else if (fCurrentZone.GetParent(&parent) == B_OK) {
 		if (BMenuItem* item = fRegionPopUp->FindItem(parent.Leaf()))
 			item->SetMarked(true);
 		czone = FillCityList(parent.Path());
@@ -126,7 +121,8 @@ TimeZoneView::AttachedToWindow()
 
 		// update displays
 		BPath parent;
-		if (strcmp(fCurrentZone.Leaf(), "Greenwich") != 0) {
+		if (fCurrentZone.Leaf() != NULL
+			&& strcmp(fCurrentZone.Leaf(), "Greenwich") != 0) {
 			fCurrentZone.GetParent(&parent);
 			int32 czone = FillCityList(parent.Path());
 			if (czone > -1) {
@@ -148,9 +144,10 @@ TimeZoneView::AttachedToWindow()
 void
 TimeZoneView::MessageReceived(BMessage *message)
 {
-	int32 change;
-	switch(message->what) {
+	switch (message->what) {
 		case B_OBSERVER_NOTICE_CHANGE:
+		{
+			int32 change;
 			message->FindInt32(B_OBSERVE_WHAT_CHANGE, &change);
 			switch(change) {
 				case H_TM_CHANGED:
@@ -162,6 +159,8 @@ TimeZoneView::MessageReceived(BMessage *message)
 					break;
 			}
 			break;
+		}
+
 		case H_REGION_CHANGED:
 			ChangeRegion(message);
 			break;
@@ -274,11 +273,9 @@ void
 TimeZoneView::BuildRegionMenu()
 {
 	BPath path;
-	if (find_directory(B_BEOS_ETC_DIRECTORY, &path) != B_OK)
+	if (_GetTimezonesPath(path) != B_OK)
 		return;
 
-	path.Append("timezones");
-
 	// get current region
 	BPath region;
 	fCurrentZone.GetParent(&region);
@@ -324,7 +321,8 @@ TimeZoneView::BuildRegionMenu()
 	msg->AddString("region", "Others");
 
 	item = new BMenuItem("Others", msg);
-	item->SetMarked(strcmp(fCurrentZone.Leaf(), "Greenwich") == 0);
+	if (fCurrentZone.Leaf() != NULL)
+		item->SetMarked(strcmp(fCurrentZone.Leaf(), "Greenwich") == 0);
 	fRegionPopUp->AddItem(item);
 }
 
@@ -343,27 +341,22 @@ TimeZoneView::FillCityList(const char *area)
  	BStringItem *city;
 	int32 index = -1;
 	if (strcmp(area, "Others") != 0) {
-
 		// Enter time zones directory. Find subdir with name that matches string
 		// stored in area. Enter subdirectory and count the items. For each item,
 		// add a StringItem to fCityList Time zones directory
 
 		BPath path;
-		if (find_directory(B_BEOS_ETC_DIRECTORY, &path) != B_OK)
-			return 0;
+		_GetTimezonesPath(path);
 
-		path.Append("timezones");
-
-		BPath Area(area);
+		BPath areaPath(area);
 	 	BDirectory zoneDir(path.Path());
 	 	BDirectory cityDir;
 	 	BString city_name;
 	 	BEntry entry;
 
-	
-		//locate subdirectory:
-		if (zoneDir.Contains(Area.Leaf(), B_DIRECTORY_NODE)) {
-			cityDir.SetTo(&zoneDir, Area.Leaf());  
+		// locate subdirectory:
+		if (zoneDir.Contains(areaPath.Leaf(), B_DIRECTORY_NODE)) {
+			cityDir.SetTo(&zoneDir, areaPath.Leaf());
 
 			// There is a subdir with a name that matches 'area'. That's the one!!
 			// Iterate over the items in the subdir, fill listview with TZoneItems
@@ -377,15 +370,21 @@ TimeZoneView::FillCityList(const char *area)
 					city_name.ReplaceAll("_", " ");
 					city = new TZoneItem(city_name.String(), zone.Path());
 					fCityList->AddItem(city);
-					if (strcmp(fCurrentZone.Leaf(), zone.Leaf()) == 0)
+					if (fCurrentZone.Leaf() != NULL
+						&& strcmp(fCurrentZone.Leaf(), zone.Leaf()) == 0)
 						index = fCityList->IndexOf(city);
 				}
 			}
 		}
 	} else {
-		city = new TZoneItem("Greenwich", "/boot/beos/etc/timezones/Greenwich");
+		BPath path;
+		_GetTimezonesPath(path);
+		path.Append("Greenwich");
+
+		city = new TZoneItem("Greenwich", path.Path());
 		fCityList->AddItem(city);
-		if (strcmp(fCurrentZone.Leaf(), "Greenwich") == 0) {
+		if (fCurrentZone.Leaf() != NULL
+			&& strcmp(fCurrentZone.Leaf(), "Greenwich") == 0) {
 			index = fCityList->IndexOf(city);
 		}
 	}
@@ -406,44 +405,21 @@ TimeZoneView::ChangeRegion(BMessage *message)
 void
 TimeZoneView::ReadTimeZoneLink()
 {
-	BEntry tzLink;
-
-#if TARGET_PLATFORM_HAIKU
-	extern status_t _kern_get_tzfilename(char *filename, size_t length, bool *_isGMT);
-	
-	char tzFileName[B_OS_PATH_LENGTH];
+	char tzFileName[B_PATH_NAME_LENGTH];
 	bool isGMT;
-	_kern_get_tzfilename(tzFileName, B_OS_PATH_LENGTH, &isGMT);
+	_kern_get_tzfilename(tzFileName, B_PATH_NAME_LENGTH, &isGMT);
+
+	BEntry tzLink;
 	tzLink.SetTo(tzFileName);
-#else
-	/*	reads the timezone symlink from B_USER_SETTINGS_DIRECTORY currently
-		this sets fCurrentZone to the symlink value, this is wrong. The 
-		original can get users timezone without a timezone symlink present.  
 
-		Defaults are set to different values to clue in on what error was returned
-	  	GMT is set when the link is invalid EST is set when the settings dir can't 
-		be found what should never happen.
-	*/
+	if (!tzLink.Exists()) {
+		BPath path;
+		_GetTimezonesPath(path);
+		path.Append("Greenwich");
 
+		tzLink.SetTo(path.Path());
+	}
 
- 	BPath path;
- 	if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) {
-
- 		path.Append("timezone");
-		tzLink.SetTo(path.Path(), true);
-
-		if (tzLink.InitCheck() != B_OK) {// link is broken
-			tzLink.SetTo("/boot/beos/etc/timezones/Pacific/fiji");
-			// do something like set to a default GMT???
-		}
-		else if (!tzLink.Exists()) { // link doesn't exists
-			tzLink.SetTo("/boot/beos/etc/timezones/Greenwich");
-		}
- 	} else {
- 		// directory doesn't exist
- 		tzLink.SetTo("/boot/beos/etc/timezones/EST");
- 	}
-#endif
 	// we need something in the current zone
 	fCurrentZone.SetTo(&tzLink);
 	fOldZone.SetTo(&tzLink);
@@ -556,3 +532,14 @@ TimeZoneView::SetTimeZone(const char *zone)
 	tzset();
 }
 
+
+status_t
+TimeZoneView::_GetTimezonesPath(BPath& path)
+{
+	status_t status = find_directory(B_SYSTEM_DATA_DIRECTORY, &path);
+	if (status != B_OK)
+		return status;
+
+	return path.Append("timezones");
+}
+

src/preferences/time/ZoneView.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2004-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -45,6 +45,8 @@ class TimeZoneView : public BView {
 		// returns index of current zone
 		int32 			FillCityList(const char *area);
 
+		status_t		_GetTimezonesPath(BPath& path);
+
 	private:
 		BPopUpMenu 		*fRegionPopUp;
 		BListView 		*fCityList;

src/servers/debug/DebugServer.cpp

@@ -42,7 +42,7 @@ static const char *kSignature = "application/x-vnd.Haiku-debug_server";
 
 // paths to the apps used for debugging
 static const char *kConsoledPath	= "/bin/consoled";
-static const char *kTerminalPath	= "/boot/beos/apps/Terminal";
+static const char *kTerminalPath	= "/boot/system/apps/Terminal";
 static const char *kGDBPath			= "/bin/gdb";
 
 

src/servers/registrar/TRoster.cpp

@@ -38,17 +38,10 @@
 using std::nothrow;
 using namespace BPrivate;
 
-//------------------------------------------------------------------------------
-// Private local function declarations
-//------------------------------------------------------------------------------
 
 static bool larger_index(const recent_entry *entry1, const recent_entry *entry2);
 
 
-//------------------------------------------------------------------------------
-// TRoster 
-//------------------------------------------------------------------------------
-
 /*!
 	\class TRoster
 	\brief Implements the application roster.
@@ -79,10 +72,10 @@ const bigtime_t kMaximalEarlyPreRegistrationPeriod = 60000000LL;
 
 //! Applications living in this tree are considered "vital system apps".
 static const char *const kVitalSystemAppPathPrefix
-	= "/boot/beos/system/servers";
+	= "/boot/system/servers";
 
 //! Applications living in this tree are considered "system apps".
-static const char *const kSystemAppPathPrefix = "/boot/beos/system";
+static const char *const kSystemAppPathPrefix = "/boot/system";
 
 // get_default_roster_settings_file
 /*!	\brief Returns the path to the default roster settings.
@@ -112,18 +105,19 @@ get_default_roster_settings_file(BPath &path)
 	The object is completely initialized and ready to handle requests.
 */
 TRoster::TRoster()
-	   : fLock("roster"),
-	     fRegisteredApps(),
-		 fEarlyPreRegisteredApps(),
-		 fIARRequestsByID(),
-		 fIARRequestsByToken(),
-		 fActiveApp(NULL),
-		 fWatchingService(),
-		 fRecentApps(),
-		 fRecentDocuments(),
-		 fRecentFolders(),
-		 fLastToken(0),
-		 fShuttingDown(false)
+	:
+	fLock("roster"),
+	fRegisteredApps(),
+	fEarlyPreRegisteredApps(),
+	fIARRequestsByID(),
+	fIARRequestsByToken(),
+	fActiveApp(NULL),
+	fWatchingService(),
+	fRecentApps(),
+	fRecentDocuments(),
+	fRecentFolders(),
+	fLastToken(0),
+	fShuttingDown(false)
 {
 	_LoadRosterSettings();
 }
@@ -1994,9 +1988,8 @@ TRoster::_SaveRosterSettings(const char *path)
 }
 
 
-//------------------------------------------------------------------------------
-// Private local functions
-//------------------------------------------------------------------------------
+//	#pragma mark - Private local functions
+
 
 /*! \brief Returns true if entry1's index is larger than entry2's index.
 

src/system/boot/Jamfile

@@ -22,7 +22,7 @@ local librootFunctions =
 	strtol.o
 ;
 
-AddResources zbeos : boot_loader.rdef ;
+AddResources haiku_loader : boot_loader.rdef ;
 
 KernelLd boot_loader_$(TARGET_BOOT_PLATFORM) :
 	boot_platform_$(TARGET_BOOT_PLATFORM).o
@@ -68,12 +68,12 @@ actions BuildCoffLoader bind HACK_COFF {
 
 BuildCoffLoader boot_loader_$(TARGET_BOOT_PLATFORM)_coff : boot_loader_$(TARGET_BOOT_PLATFORM) ;
 
-rule BuildZbeos {
-	local zbeos = $(1) ;
+rule BuildBiosLoader {
+	local haikuLoader = $(1) ;
 	local bootLoader = $(2) ;
 
-	Depends $(zbeos) : $(bootLoader) ;
-	MakeLocateDebug $(zbeos) ;
+	Depends $(haikuLoader) : $(bootLoader) ;
+	MakeLocateDebug $(haikuLoader) ;
 
 	on $(1) ResAttr $(1) : $(RESFILES) : false ;
 	if ! [ on $(1) return $(DONT_USE_BEOS_RULES) ] {
@@ -82,15 +82,15 @@ rule BuildZbeos {
 	}
 }
 
-actions BuildZbeos {
+actions BuildBiosLoader {
 	rm -f $(1)
 	$(TARGET_OBJCOPY) -O binary $(2) $(1)
 }
 
-BuildZbeos zbeos : boot_loader_$(TARGET_BOOT_PLATFORM) ;
+BuildBiosLoader haiku_loader : boot_loader_$(TARGET_BOOT_PLATFORM) ;
 
 # different target for PXE, to be build with TARGET_BOOT_PLATFORM=pxe_ia32 jam pxehaiku-loader
-BuildZbeos pxehaiku-loader : boot_loader_$(TARGET_BOOT_PLATFORM) ;
+BuildBiosLoader pxehaiku-loader : boot_loader_$(TARGET_BOOT_PLATFORM) ;
 
 SubInclude HAIKU_TOP src system boot arch $(TARGET_ARCH) ;
 SubInclude HAIKU_TOP src system boot loader ;

src/system/boot/loader/loader.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2003-2009, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -24,11 +24,11 @@
 #endif
 
 #define KERNEL_IMAGE	"kernel_" BOOT_ARCH
-#define KERNEL_PATH		"beos/system/" KERNEL_IMAGE
+#define KERNEL_PATH		"system/" KERNEL_IMAGE
 
 
 static const char *sPaths[] = {
-	"beos/system/add-ons/kernel",
+	"system/add-ons/kernel",
 	"home/config/add-ons/kernel",
 	NULL
 };

src/system/boot/platform/atari_m68k/shell.S

@@ -22,7 +22,7 @@
 /*
  * generate boot floppy:
  * cd src/system/boot/platform/atari_m68k/ ; make fixup_tos_floppy_chksum; cd -
- * dd if=generated/objects/haiku/m68k/release/system/boot/zbeos of=~/floppy.img bs=512 count=20 conv=notrunc
+ * dd if=generated/objects/haiku/m68k/release/system/boot/haiku_loader of=~/floppy.img bs=512 count=20 conv=notrunc
  * src/system/boot/platform/atari_m68k/fixup_tos_floppy_chksum ~/floppy.img
  * generate .prg:
  * generated.m68k/cross-tools/bin/m68k-unknown-haiku-ld -o haiku.prg -T src/system/ldscripts/m68k/boot_prg_atari_m68k.ld generated/objects/haiku/m68k/release/system/boot/boot_loader_atari_m68k
@@ -355,7 +355,7 @@ h5:
 unimpl:
 	.string "Unimplemented."
 msg_j1:
-	.string "jumping to zbeos."
+	.string "jumping to haiku_loader."
 
 
 shell_end:

src/system/boot/platform/atari_m68k/stage1.S

@@ -22,7 +22,7 @@
  * The offset of the partition in 512 byte blocks must be written at
  * position PARTITION_OFFSET_OFFSET (32 bit little endian; makebootable does
  * that) or otherwise the code can't find the partition.
- * The partition must be a BFS formatted. The file "beos/system/zbeos"
+ * The partition must be a BFS formatted. The file "system/haiku_loader"
  * (the stage 2 boot loader) loaded into memory at 0x1000:0x0000 (linear address
  * 0x10000) and entered at 0x:1000:0x0200 with parameters eax - partition offset
  * in 512 byte blocks and dl - BIOS ID of the boot drive.

src/system/boot/platform/bios_ia32/stage1.S

@@ -5,7 +5,7 @@
 ; partitions. The offset of the partition in 512 byte blocks must be written at
 ; position PARTITION_OFFSET_OFFSET (32 bit little endian; makebootable does
 ; that) or otherwise the code can't find the partition.
-; The partition must be a BFS formatted. The file "beos/system/zbeos"
+; The partition must be a BFS formatted. The file "system/haiku_loader"
 ; (the stage 2 boot loader) loaded into memory at 0x1000:0x0000 (linear address
 ; 0x10000) and entered at 0x:1000:0x0200 with parameters eax - partition offset
 ; in 512 byte blocks and dl - BIOS ID of the boot drive.
@@ -29,7 +29,7 @@
 
 ; BFS definitions
 
-%assign SUPER_BLOCK_MAGIC1			'1SFB'		; nasm reverses '...' consts
+%define SUPER_BLOCK_MAGIC1			'1SFB'		; nasm reverses '...' consts
 %assign SUPER_BLOCK_MAGIC2			0xdd121031
 %assign SUPER_BLOCK_MAGIC3			0x15b6830e
 
@@ -92,7 +92,7 @@
 
 
 ; 16 bit code
-SECTION
+SECTION .text
 BITS 16
 ORG BOOT_BLOCK_START_ADDRESS					; start code at 0x7c00
 
@@ -328,7 +328,7 @@ _writeString:
 	int			BIOS_VIDEO_SERVICES
 
 	jmp			.loop
-.loopend
+.loopend:
 
 	ret
 
@@ -631,7 +631,7 @@ kReadErrorString			db	"read error", 0
 kBadSuperBlockMagicString	db	"bad superblock magic", 0
 kNotADirectoryString		db	"not a directory", 0
 kBadInodeMagicString		db	"bad inode magic", 0
-kNoZbeosString				db	"zbeos not found", 0
+kNoZbeosString				db	"haiku_loader not found", 0
 %else
 kErrorString				db	"Failed to load OS. Press any key to reboot..."
 							db	0
@@ -639,9 +639,8 @@ kErrorString				db	"Failed to load OS. Press any key to reboot..."
 
 ; the path to the boot loader
 kPathComponents:
-pathComponent				"beos"
 pathComponent				"system"
-pathComponent				"zbeos"
+pathComponent				"haiku_loader"
 							db	0
 
 
@@ -899,7 +898,7 @@ readInode:
 
 	error		kBadInodeMagicString
 
-.no_error	
+.no_error:
 	popad
 
 	ret

src/system/boot/platform/generic/text_menu.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 
@@ -203,7 +203,7 @@ draw_menu(Menu *menu)
 	print_centered(2, "Haiku Boot Loader");
 
 	console_set_color(kCopyrightColor, kBackgroundColor);
-	print_centered(4, "Copyright 2004-2008 Haiku Inc.");
+	print_centered(4, "Copyright 2004-2009 Haiku Inc.");
 
 	if (menu->Title()) {
 		console_set_cursor(kOffsetX, kFirstLine - 2);

src/system/kernel/fs/vfs_boot.cpp

@@ -45,9 +45,9 @@ static struct {
 	const char *path;
 	const char *target;
 } sPredefinedLinks[] = {
-	{"/system", "/boot/beos/system"},
-	{"/bin", "/boot/beos/bin"},
-	{"/etc", "/boot/beos/etc"},
+	{"/system", "/boot/system"},
+	{"/bin", "/boot/system/bin"},
+	{"/etc", "/boot/system/etc"},
 	{"/var", "/boot/var"},
 	{"/tmp", "/boot/var/tmp"},
 	{NULL}

src/system/libroot/os/find_directory.c

@@ -1,5 +1,7 @@
 /*
- * Copyright (c) 2004-2008, François Revol.
+ * Copyright 2004, François Revol.
+ * Copyright 2007-2009, Axel Dörfler, axeld@pinc-software.de.
+ *
  * Distributed under the terms of the MIT license.
  */
 
@@ -30,28 +32,25 @@
 
 /* Haiku system directories */
 
-/* os root dir; just stick to 'beos' for now */
-#define SYSTEM "beos"
-//#define SYSTEM "haiku" // :)
-//#define SYSTEM "os"
+#define SYSTEM "system"
 
 static const char *kSystemDirectories[] = {
-	SYSTEM,										// B_BEOS_DIRECTORY
-	SYSTEM "/system",
-	SYSTEM "/system/add-ons",
-	SYSTEM "/system/boot",
-	SYSTEM "/etc/fonts",
-	SYSTEM "/system/lib",
-	SYSTEM "/system/servers",
+	SYSTEM,										// B_SYSTEM_DIRECTORY
+	SYSTEM,										// B_BEOS_SYSTEM_DIRECTORY
+	SYSTEM "/add-ons",
+	SYSTEM "/boot",
+	SYSTEM "/fonts",
+	SYSTEM "/lib",
+	SYSTEM "/servers",
 	SYSTEM "/apps",
 	SYSTEM "/bin",
 	SYSTEM "/etc",
 	SYSTEM "/documentation",
 	SYSTEM "/preferences",
-	SYSTEM "/system/add-ons/Translators",
-	SYSTEM "/system/add-ons/media",
-	SYSTEM "/etc/sounds",
-	SYSTEM "/etc",
+	SYSTEM "/add-ons/Translators",
+	SYSTEM "/add-ons/media",
+	SYSTEM "/data/sounds",
+	SYSTEM "/data",
 };
 
 /* Common directories, shared among users */
@@ -79,7 +78,7 @@ static const char *kCommonDirectories[] = {
 	"var",									// B_COMMON_VAR_DIRECTORY
 	COMMON "/add-ons/Translators",
 	COMMON "/add-ons/media",
-	COMMON "/sounds",
+	COMMON "/data/sounds",
 	COMMON "/data",
 };
 
@@ -99,7 +98,7 @@ static const char *kUserDirectories[] = {
 	HOME "/config/settings/printers",
 	HOME "/config/add-ons/Translators",
 	HOME "/config/add-ons/media",
-	HOME "/config/sounds",
+	HOME "/config/data/sounds",
 	HOME "/config/data",
 	HOME "/config/cache",
 };
@@ -208,23 +207,23 @@ find_directory(directory_which which, dev_t device, bool createIt,
 			break;
 
 		/* Haiku system directories */
-		case B_BEOS_DIRECTORY:
+		case B_SYSTEM_DIRECTORY:
 		case B_BEOS_SYSTEM_DIRECTORY:
-		case B_BEOS_ADDONS_DIRECTORY:
-		case B_BEOS_BOOT_DIRECTORY:
-		case B_BEOS_FONTS_DIRECTORY:
-		case B_BEOS_LIB_DIRECTORY:
-		case B_BEOS_SERVERS_DIRECTORY:
-		case B_BEOS_APPS_DIRECTORY:
-		case B_BEOS_BIN_DIRECTORY:
-		case B_BEOS_ETC_DIRECTORY:
-		case B_BEOS_DOCUMENTATION_DIRECTORY:
-		case B_BEOS_PREFERENCES_DIRECTORY:
-		case B_BEOS_TRANSLATORS_DIRECTORY:
-		case B_BEOS_MEDIA_NODES_DIRECTORY:
-		case B_BEOS_SOUNDS_DIRECTORY:
-		case B_BEOS_DATA_DIRECTORY:
-			template = kSystemDirectories[which - B_BEOS_DIRECTORY];
+		case B_SYSTEM_ADDONS_DIRECTORY:
+		case B_SYSTEM_BOOT_DIRECTORY:
+		case B_SYSTEM_FONTS_DIRECTORY:
+		case B_SYSTEM_LIB_DIRECTORY:
+		case B_SYSTEM_SERVERS_DIRECTORY:
+		case B_SYSTEM_APPS_DIRECTORY:
+		case B_SYSTEM_BIN_DIRECTORY:
+		case B_SYSTEM_ETC_DIRECTORY:
+		case B_SYSTEM_DOCUMENTATION_DIRECTORY:
+		case B_SYSTEM_PREFERENCES_DIRECTORY:
+		case B_SYSTEM_TRANSLATORS_DIRECTORY:
+		case B_SYSTEM_MEDIA_NODES_DIRECTORY:
+		case B_SYSTEM_SOUNDS_DIRECTORY:
+		case B_SYSTEM_DATA_DIRECTORY:
+			template = kSystemDirectories[which - B_SYSTEM_DIRECTORY];
 			break;
 
 		/* Common directories, shared among users */

src/system/runtime_loader/runtime_loader.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2005-2009, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2002, Manuel J. Petit. All rights reserved.
@@ -65,22 +65,22 @@ search_path_for_type(image_type type)
 				":/bin"
 				":/boot/apps"
 				":/boot/preferences"
-				":/boot/beos/apps"
-				":/boot/beos/preferences"
+				":/boot/system/apps"
+				":/boot/system/preferences"
 				":/boot/develop/tools/gnupro/bin";
 
 		case B_LIBRARY_IMAGE:
 			return "%A/lib"
 				":/boot/home/config/lib"
 					// TODO: Remove!
-				":/boot/common/lib:/boot/beos/system/lib";
+				":/boot/common/lib:/boot/system/lib";
 
 		case B_ADD_ON_IMAGE:
 			return "%A/add-ons"
 				":/boot/home/config/add-ons"
 					// TODO: Remove!
 				":/boot/common/add-ons"
-				":/boot/beos/system/add-ons";
+				":/boot/system/add-ons";
 
 		default:
 			return NULL;
@@ -395,8 +395,7 @@ runtime_loader(void *_args)
 			gProgramArgs->env[i] += relocationOffset;
 	}
 
-	if (!strcmp(gProgramArgs->program_path,
-			"/boot/beos/system/runtime_loader")) {
+	if (!strcmp(gProgramArgs->program_path, "/boot/system/runtime_loader")) {
 		// TODO: this is a (temporary) work-around for bug #2273 which causes
 		// the cache's mutex to be locked twice when starting the runtime_loader
 		// itself.