Added Installer and DriveSetup to image.

build/jam/Haiku64Image

@@ -19,23 +19,23 @@ if $(HAIKU_ATA_STACK) = 1 {
 	IDE_ONLY = "" ;
 }
 
-SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr chgrp chmod
+SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr checkfs
-	chown chroot cksum clear clockconfig cmp collectcatkeys comm compress
+	chgrp chmod chown chroot cksum clear clockconfig cmp collectcatkeys comm
-	copyattr cp csplit cut date dd diff diff3 dircolors dirname df du
+	compress copyattr cp csplit cut date dd diff diff3 dircolors dirname df du
 	dumpcatalog echo eject env error expand expr factor false find finddir
 	fmt fold fortune gawk gdb gzip gzexe getlimits grep groups head hostname id
 	ifconfig <bin>install isvolume join kernel_debugger kill less lessecho
-	lesskey link linkcatkeys listdev ln locale locate logger logname ls md5sum
+	lesskey link linkcatkeys listdev ln locale locate logger logname ls
-	mkdir mkfifo mktemp mount mountvolume mv nl nohup nproc od paste patch
+	makebootable md5sum mkdir mkfifo mkfs  mktemp mount mountvolume mv nl
-	pathchk ping pr printenv printf ps ptx pwd rc readlink ReadOnlyBootPrompt
+	nohup nproc od paste patch pathchk ping pr printenv printf ps ptx pwd rc
-	rm rmattr rmdir safemode sdiff seq sha1sum shred shuf sleep sort split stat
+	readlink ReadOnlyBootPrompt rm rmattr rmdir safemode sdiff seq sha1sum
-	strace stty su sum sync sysinfo tac tail tee test timeout touch tr true
+	shred shuf sleep sort split stat strace stty su sum sync sysinfo tac tail
-	truncate tsort tty unexpand uname uniq unlink unmount unzip <bin>updatedb
+	tee test timeout touch tr true truncate tsort tty unexpand uname uniq
-	waitfor wc wget whoami xargs xres yes zdiff zforce zgrep zip zipcloak
+	unlink unmount unzip <bin>updatedb waitfor wc wget whoami xargs xres yes
-	<bin>zipgrep zipnote zipsplit zmore znew
+	zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
 ;
 
-SYSTEM_APPS = AboutSystem Terminal ;
+SYSTEM_APPS = AboutSystem DriveSetup Installer Terminal ;
 
 SYSTEM_PREFERENCES = Appearance Backgrounds <preference>Deskbar FileTypes
 	Keyboard Keymap Locale Mouse Network Notifications Screen Time Touchpad
@@ -170,7 +170,7 @@ AddDirectoryToHaikuImage home mail out ;
 AddSymlinkToHaikuImage home config : settings/deskbar : be ;
 # Deskbar Application links
 AddDirectoryToHaikuImage home config settings deskbar Applications ;
-DESKBAR_APPLICATIONS = Terminal ;
+DESKBAR_APPLICATIONS = DriveSetup Installer Terminal ;
 local linkTarget ;
 for linkTarget in $(DESKBAR_APPLICATIONS) {
 	AddSymlinkToHaikuImage home config settings deskbar Applications
@@ -331,6 +331,9 @@ AddFilesToHaikuImage system add-ons kernel network datalink_protocols
 AddFilesToHaikuImage system add-ons kernel network protocols
 	: $(SYSTEM_NETWORK_PROTOCOLS) ;
 
+AddFilesToHaikuImage system add-ons disk_systems
+	: <disk_system>intel <disk_system>bfs ;
+
 # create directories that will remain empty
 AddDirectoryToHaikuImage common bin ;
 AddDirectoryToHaikuImage common include ;

src/add-ons/disk_systems/bfs/BFSAddOn.cpp

@@ -255,11 +255,11 @@ BFSPartitionHandle::Repair(bool checkOnly)
 	while (ioctl(fd, BFS_IOCTL_CHECK_NEXT_NODE, &result,
 			sizeof(result)) == 0) {
 		if (++counter % 50 == 0)
-			printf("%9Ld nodes processed\x1b[1A\n", counter);
+			printf("%9" B_PRId64 " nodes processed\x1b[1A\n", counter);
 
 		if (result.pass == BFS_CHECK_PASS_BITMAP) {
 			if (result.errors) {
-				printf("%s (inode = %lld)", result.name, result.inode);
+				printf("%s (inode = %" B_PRIdINO ")", result.name, result.inode);
 				if ((result.errors & BFS_MISSING_BLOCKS) != 0)
 					printf(", some blocks weren't allocated");
 				if ((result.errors & BFS_BLOCKS_ALREADY_SET) != 0)

src/apps/drivesetup/DriveSetup.cpp

@@ -23,7 +23,7 @@
 DriveSetup::DriveSetup()
 	: BApplication("application/x-vnd.Haiku-DriveSetup"),
 	fWindow(NULL),
-	fSettings(0UL)
+	fSettings((uint32)0)
 {
 }
 

src/apps/drivesetup/MainWindow.cpp

@@ -518,9 +518,9 @@ void
 MainWindow::_UpdateMenus(BDiskDevice* disk,
 	partition_id selectedPartition, partition_id parentID)
 {
-	while (BMenuItem* item = fFormatMenu->RemoveItem(0L))
+	while (BMenuItem* item = fFormatMenu->RemoveItem((int32)0))
 		delete item;
-	while (BMenuItem* item = fDiskInitMenu->RemoveItem(0L))
+	while (BMenuItem* item = fDiskInitMenu->RemoveItem((int32)0))
 		delete item;
 
 	fCreateMI->SetEnabled(false);

src/apps/drivesetup/Support.cpp

@@ -28,14 +28,14 @@ void
 dump_partition_info(const BPartition* partition)
 {
 	char size[1024];
-	printf("\tOffset(): %Ld\n", partition->Offset());
+	printf("\tOffset(): %" B_PRIdOFF "\n", partition->Offset());
 	printf("\tSize(): %s\n", string_for_size(partition->Size(), size,
 		sizeof(size)));
 	printf("\tContentSize(): %s\n", string_for_size(partition->ContentSize(),
 		size, sizeof(size)));
-	printf("\tBlockSize(): %ld\n", partition->BlockSize());
+	printf("\tBlockSize(): %" B_PRId32 "\n", partition->BlockSize());
-	printf("\tIndex(): %ld\n", partition->Index());
+	printf("\tIndex(): %" B_PRId32 "\n", partition->Index());
-	printf("\tStatus(): %ld\n\n", partition->Status());
+	printf("\tStatus(): %" B_PRId32 "\n\n", partition->Status());
 	printf("\tContainsFileSystem(): %s\n",
 		partition->ContainsFileSystem() ? "true" : "false");
 	printf("\tContainsPartitioningSystem(): %s\n\n",
@@ -44,12 +44,12 @@ dump_partition_info(const BPartition* partition)
 	printf("\tIsReadOnly(): %s\n", partition->IsReadOnly() ? "true" : "false");
 	printf("\tIsMounted(): %s\n", partition->IsMounted() ? "true" : "false");
 	printf("\tIsBusy(): %s\n\n", partition->IsBusy() ? "true" : "false");
-	printf("\tFlags(): %lx\n\n", partition->Flags());
+	printf("\tFlags(): %" B_PRIx32 "\n\n", partition->Flags());
 	printf("\tName(): %s\n", partition->Name());
 	printf("\tContentName(): %s\n", partition->ContentName());
 	printf("\tType(): %s\n", partition->Type());
 	printf("\tContentType(): %s\n", partition->ContentType());
-	printf("\tID(): %lx\n\n", partition->ID());
+	printf("\tID(): %" B_PRIx32 "\n\n", partition->ID());
 }
 
 

src/apps/installer/ProgressReporter.cpp

@@ -69,8 +69,8 @@ ProgressReporter::StartTimer()
 {
 	fStartTime = system_time();
 
-	printf("%lld bytes to write in %lld files\n", fBytesToWrite,
+	printf("%" B_PRIdOFF " bytes to write in %" B_PRId64 " files\n",
-		fItemsToWrite);
+		fBytesToWrite, fItemsToWrite);
 
 	if (fMessage) {
 		BMessage message(*fMessage);

src/apps/installer/UnzipEngine.cpp

@@ -83,7 +83,7 @@ UnzipEngine::SetTo(const char* pathToPackage, const char* destinationFolder)
 	ret = commandPipe.ReadLines(stdOutAndErrPipe, this);
 	fRetrievingListing = false;
 
-	printf("%llu items in %llu bytes\n", fItemsToUncompress,
+	printf("%" B_PRIu64 " items in %" B_PRIdOFF " bytes\n", fItemsToUncompress,
 		fBytesToUncompress);
 
 	return ret;