Subversion Repositories HelenOS

Compare Revisions

Regard whitespace Rev 4591 → Rev 4592

/trunk/uspace/app/init/init.c
55,7 → 55,6
 
static bool mount_root(const char *fstype)
{
int rc = -1;
char *opts = "";
const char *root_dev = "initrd";
62,8 → 61,7
if (str_cmp(fstype, "tmpfs") == 0)
opts = "restore";
 
while (rc < 0) {
rc = mount(fstype, "/", root_dev, opts, IPC_FLAG_BLOCKING);
int rc = mount(fstype, "/", root_dev, opts, IPC_FLAG_BLOCKING);
switch (rc) {
case EOK:
72,7 → 70,7
break;
case EBUSY:
printf(NAME ": Root filesystem already mounted\n");
break;
return false;
case ELIMIT:
printf(NAME ": Unable to mount root filesystem\n");
return false;
79,8 → 77,10
case ENOENT:
printf(NAME ": Unknown filesystem type (%s)\n", fstype);
return false;
default:
printf(NAME ": Error mounting root filesystem (%d)\n", rc);
return false;
}
}
return true;
}
87,11 → 87,17
 
static bool mount_devfs(void)
{
int rc = -1;
char null[MAX_DEVICE_NAME];
int null_id = devmap_null_create();
while (rc < 0) {
rc = mount("devfs", "/dev", "null", "", IPC_FLAG_BLOCKING);
if (null_id == -1) {
printf(NAME ": Unable to create null device\n");
return false;
}
snprintf(null, MAX_DEVICE_NAME, "null%d", null_id);
int rc = mount("devfs", "/dev", null, "", IPC_FLAG_BLOCKING);
switch (rc) {
case EOK:
printf(NAME ": Device filesystem mounted\n");
98,15 → 104,21
break;
case EBUSY:
printf(NAME ": Device filesystem already mounted\n");
break;
devmap_null_destroy(null_id);
return false;
case ELIMIT:
printf(NAME ": Unable to mount device filesystem\n");
devmap_null_destroy(null_id);
return false;
case ENOENT:
printf(NAME ": Unknown filesystem type (devfs)\n");
devmap_null_destroy(null_id);
return false;
default:
printf(NAME ": Error mounting device filesystem (%d)\n", rc);
devmap_null_destroy(null_id);
return false;
}
}
return true;
}
188,7 → 200,7
spawn("/srv/ata_bd");
spawn("/srv/gxe_bd");
 
usleep(250000);
usleep(250000); // FIXME
mount_data();
 
getvc("vc0", "/app/bdsh");