From 4c3702d42a79c7b69c5e2fcae190196380dfb034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Mon, 4 Sep 2006 13:10:08 +0000
Subject: [PATCH] moved rescan call to vfs_mount_boot_file_system() as
 suggested by axeld :)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18738 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/private/kernel/ddm.h                  | 19 -------------------
 .../disk_device_manager.cpp                   |  8 --------
 src/system/kernel/fs/vfs_boot.cpp             |  5 +++++
 src/system/kernel/main.c                      |  2 --
 4 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 headers/private/kernel/ddm.h

diff --git a/headers/private/kernel/ddm.h b/headers/private/kernel/ddm.h
deleted file mode 100644
index 5a6137e9f1..0000000000
--- a/headers/private/kernel/ddm.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2006, Jerome Duval. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- */
-#ifndef _KERNEL_DDM_H
-#define _KERNEL_DDM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-status_t ddm_init_post_modules(struct kernel_args *args);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* _KERNEL_DDM_H */
diff --git a/src/system/kernel/disk_device_manager/disk_device_manager.cpp b/src/system/kernel/disk_device_manager/disk_device_manager.cpp
index d13d97dbdf..1f8dc57d51 100644
--- a/src/system/kernel/disk_device_manager/disk_device_manager.cpp
+++ b/src/system/kernel/disk_device_manager/disk_device_manager.cpp
@@ -3,7 +3,6 @@
 #include <KernelExport.h>
 #include <stdio.h>
 
-#include "ddm.h"
 #include "disk_device_manager.h"
 #include "KDiskDevice.h"
 #include "KDiskDeviceJob.h"
@@ -274,10 +273,3 @@ update_disk_device_job_interrupt_properties(disk_job_id jobID,
 	return B_DISK_DEVICE_JOB_CONTINUE;
 }
 
-status_t
-ddm_init_post_modules(kernel_args *args)
-{
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	return manager->RescanDiskSystems();
-}
-
diff --git a/src/system/kernel/fs/vfs_boot.cpp b/src/system/kernel/fs/vfs_boot.cpp
index 5cc002b49e..3087027369 100644
--- a/src/system/kernel/fs/vfs_boot.cpp
+++ b/src/system/kernel/fs/vfs_boot.cpp
@@ -351,6 +351,11 @@ vfs_mount_boot_file_system(kernel_args *args)
 	}
 
 	file_cache_init_post_boot_device();
+
+	// search for other disk systems
+	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
+	manager->RescanDiskSystems();
+
 	return B_OK;
 }
 
diff --git a/src/system/kernel/main.c b/src/system/kernel/main.c
index ec2d4dc508..4231eaadcf 100644
--- a/src/system/kernel/main.c
+++ b/src/system/kernel/main.c
@@ -16,7 +16,6 @@
 #include <cbuf.h>
 #include <cpu.h>
 #include <debug.h>
-#include <ddm.h>
 #include <elf.h>
 #include <int.h>
 #include <kdevice_manager.h>
@@ -228,7 +227,6 @@ main2(void *unused)
 	cpu_init_post_modules(&sKernelArgs);
 	vm_init_post_modules(&sKernelArgs);
 	debug_init_post_modules(&sKernelArgs);
-	ddm_init_post_modules(&sKernelArgs);
 
 	// start the init process
 	{