From 0e7e72993999217a6da0754fd2a611df8537b494 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 13 Jan 2005 23:52:59 +0000
Subject: [PATCH] * Added the registrar server and the roster command (wasn't
 able to test   yet, due to problems with our system). * The config driver
 lives actually in misc/config. Also added the missing   symlink.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10717 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 makehdimage | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/makehdimage b/makehdimage
index 742b4651d0..6843fb7a4b 100755
--- a/makehdimage
+++ b/makehdimage
@@ -57,15 +57,18 @@ BEOS_BIN="touch sync ln listarea listattr listsem listport \
 	true false ls df mount unmount cp mv ps sh mkdir sleep \
 	grep cat less clockconfig du rm date find locate xargs \
 	isvolume shutdown safemode sysinfo kill diff cmp more \
-	renice rmattr addattr listdev pwd chmod chown chgrp dd tee md5sum"
+	renice rmattr addattr listdev pwd chmod chown chgrp dd tee md5sum \
+	roster"
 
 BEOS_SYSTEM_LIB="libbe.so libstdc++.r4.so libnet.so"
 
+BEOS_SYSTEM_SERVERS="registrar"
+
 jam -q kernel boot_loader config_manager pci isa ide scsi \
 	ide_isa bfs blkman fast_log ide_adapter locked_pool \
 	scsi_periph intel keyboard scsi_dsk scsi_cd \
 	rld.so kernel_fortune consoled \
-	$BEOS_BIN $BEOS_SYSTEM_LIB \
+	$BEOS_BIN $BEOS_SYSTEM_LIB $BEOS_SYSTEM_SERVERS \
 	kernel_uname libnet.so null zero random \<driver\>tty \<driver\>config \
 	|| exit 1
 
@@ -76,6 +79,7 @@ if [ ! $alreadyMounted ]; then
 	mkbfs $imagePath Haiku
 	mkdir -p $targetDir
 	sync
+echo ""
 	$ufsMount obfs $imagePath $targetDir || exit 1
 fi
 
@@ -85,19 +89,20 @@ cd $targetDir
 # (because of some unidentified bugs, of course :)
 rm -rf beos
 
-mkdir -p beos/system/add-ons/kernel/bus_managers
-mkdir -p beos/system/add-ons/kernel/generic
-mkdir -p beos/system/add-ons/kernel/file_systems
-mkdir -p beos/system/add-ons/kernel/partitioning_systems
-mkdir -p beos/system/add-ons/kernel/busses/ide
+mkdir -p beos/bin
+mkdir -p beos/etc
 mkdir -p beos/system/add-ons/kernel/boot
+mkdir -p beos/system/add-ons/kernel/bus_managers
+mkdir -p beos/system/add-ons/kernel/busses/ide
 mkdir -p beos/system/add-ons/kernel/drivers/bin
 mkdir -p beos/system/add-ons/kernel/drivers/dev/disk/scsi
 mkdir -p beos/system/add-ons/kernel/drivers/dev/misc
-mkdir -p beos/bin
-mkdir -p beos/system/lib
+mkdir -p beos/system/add-ons/kernel/file_systems
+mkdir -p beos/system/add-ons/kernel/generic
+mkdir -p beos/system/add-ons/kernel/partitioning_systems
 mkdir -p beos/system/boot
-mkdir -p beos/etc
+mkdir -p beos/system/lib
+mkdir -p beos/system/servers
 mkdir -p home/config
 mkdir -p home/config/settings
 
@@ -129,7 +134,7 @@ for f in drivers/arch/x86/keyboard/keyboard; do
 done
 
 cd $sourceDir/distro/x86.R1/beos/system/add-ons/kernel/drivers/dev
-for f in config tty random null zero; do
+for f in misc/config tty random null zero; do
 	cp $f $targetDir/beos/system/add-ons/kernel/drivers/bin
 done
 
@@ -145,6 +150,11 @@ cd $sourceDir/objects/x86.R1/kernel/
 cp rld.so libroot.so $targetDir/beos/system/lib/
 
 
+# servers
+cd $sourceDir/distro/x86.R1/beos/system/servers
+cp $BEOS_SYSTEM_SERVERS $targetDir/beos/system/servers/
+
+
 # apps
 cd $sourceDir/objects/x86.R1/kernel
 for f in fortune uname; do
@@ -180,8 +190,9 @@ done
 
 # driver links
 cd $targetDir/beos/system/add-ons/kernel
-for f in drivers/dev/keyboard drivers/dev/null drivers/dev/tty drivers/dev/zero \
-		drivers/dev/disk/scsi/scsi_dsk drivers/dev/disk/scsi/scsi_cd drivers/dev/misc/config; do
+for f in drivers/dev/keyboard drivers/dev/null drivers/dev/misc/config \
+		drivers/dev/tty drivers/dev/zero drivers/dev/disk/scsi/scsi_dsk \
+		drivers/dev/disk/scsi/scsi_cd drivers/dev/misc/config; do
 	relName=$(echo $f | sed -e s@drivers/dev/@@)
 	linkName=bin/$(basename $f)
 	while [ $relName != . ]; do