git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: dynamic boot medium probing and mounting
[lunaix-os.git]
/
lunaix-os
/
kernel
/
proc0.c
diff --git
a/lunaix-os/kernel/proc0.c
b/lunaix-os/kernel/proc0.c
index abd0ac0df4f3d925a6f7f171b2f8d9e67f4a37f7..c38ad2bc2517f340c5f55f2d8a84cd2a892a5d8f 100644
(file)
--- a/
lunaix-os/kernel/proc0.c
+++ b/
lunaix-os/kernel/proc0.c
@@
-2,6
+2,7
@@
#include <lunaix/common.h>
#include <lunaix/foptions.h>
#include <lunaix/fs.h>
#include <lunaix/common.h>
#include <lunaix/foptions.h>
#include <lunaix/fs.h>
+#include <lunaix/fs/probe_boot.h>
#include <lunaix/fs/twifs.h>
#include <lunaix/ld.h>
#include <lunaix/lxconsole.h>
#include <lunaix/fs/twifs.h>
#include <lunaix/ld.h>
#include <lunaix/lxconsole.h>
@@
-48,14
+49,14
@@
mount_bootmedium()
{
struct v_dnode* dnode;
int errno = 0;
{
struct v_dnode* dnode;
int errno = 0;
- if ((errno = vfs_walk_proc("/dev/sdb", &dnode, NULL, 0))) {
+ struct device* dev = probe_boot_medium();
+ if (!dev) {
kprintf(KERROR "fail to acquire device. (%d)", errno);
return 0;
}
kprintf(KERROR "fail to acquire device. (%d)", errno);
return 0;
}
- struct device* dev = (struct device*)dnode->inode->data;
if ((errno = vfs_mount("/mnt/lunaix-os", "iso9660", dev, 0))) {
if ((errno = vfs_mount("/mnt/lunaix-os", "iso9660", dev, 0))) {
- kprintf(KERROR "fail to boot medium. (%d)", errno);
+ kprintf(KERROR "fail to
mount
boot medium. (%d)", errno);
return 0;
}
return 0;
}