projects
/
project
/
fstools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ed224f0
)
Revert "mount_root: code failed in failsafe"
author
John Crispin
<john@phrozen.org>
Sun, 15 May 2016 14:13:30 +0000
(16:13 +0200)
committer
John Crispin
<john@phrozen.org>
Sun, 15 May 2016 14:13:30 +0000
(16:13 +0200)
This reverts commit
09f8e0097fe1370700658542e7bda831c31de4bf
.
mount_root.c
patch
|
blob
|
history
diff --git
a/mount_root.c
b/mount_root.c
index
d1b6981
..
bf70265
100644
(file)
--- a/
mount_root.c
+++ b/
mount_root.c
@@
-27,16
+27,14
@@
static int
start(int argc, char *argv[1])
{
static int
start(int argc, char *argv[1])
{
- struct volume *root
= volume_find("rootfs")
;
+ struct volume *root;
struct volume *data = volume_find("rootfs_data");
struct volume *data = volume_find("rootfs_data");
- if (data && find_mount_point(data->blk, 0))
- return -1;
-
- if (root && find_mount_point(root->blk, 0))
+ if (!getenv("PREINIT"))
return -1;
if (!data) {
return -1;
if (!data) {
+ root = volume_find("rootfs");
volume_init(root);
ULOG_NOTE("mounting /dev/root\n");
mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);
volume_init(root);
ULOG_NOTE("mounting /dev/root\n");
mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);