Changes in uspace/app/sysinst/sysinst.c [9b95b964:c24b0dcb] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/sysinst/sysinst.c
r9b95b964 rc24b0dcb 1 1 /* 2 * Copyright (c) 20 24Jiri Svoboda2 * Copyright (c) 2018 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 62 62 * in Grub notation). 63 63 */ 64 #define DEFAULT_DEV_0 "devices/\\hw\\sys\\00:01.1\\c0d0" 65 #define DEFAULT_DEV_1 "devices/\\hw\\sys\\00:01.0\\ata1\\c0d0" 64 #define DEFAULT_DEV "devices/\\hw\\sys\\00:01.0\\ata-c1\\d0" 66 65 //#define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.2\\uhci_rh\\usb01_a1\\mass-storage0\\l0" 67 66 /** Volume label for the new file system */ … … 80 79 #define BOOT_BLOCK_IDX 0 /* MBR */ 81 80 82 static const char *default_devs[] = {83 DEFAULT_DEV_0,84 DEFAULT_DEV_1,85 NULL86 };87 88 81 static const char *sys_dirs[] = { 89 82 "/cfg", 90 "/data", 91 NULL 83 "/data" 92 84 }; 93 94 /** Check the if the destination device exists.95 *96 * @param dev Disk device97 *98 * @return EOK on success or an error code99 */100 static errno_t sysinst_check_dev(const char *dev)101 {102 service_id_t sid;103 errno_t rc;104 105 rc = loc_service_get_id(dev, &sid, 0);106 if (rc != EOK)107 return rc;108 109 (void)sid;110 return EOK;111 }112 85 113 86 /** Label the destination device. … … 388 361 389 362 printf("sysinst_copy_boot_blocks: block_init.\n"); 390 rc = block_init(sid );363 rc = block_init(sid, 512); 391 364 if (rc != EOK) 392 365 return rc; … … 517 490 int main(int argc, char *argv[]) 518 491 { 519 unsigned i; 520 errno_t rc; 521 522 i = 0; 523 while (default_devs[i] != NULL) { 524 rc = sysinst_check_dev(default_devs[i]); 525 if (rc == EOK) 526 break; 527 } 528 529 if (default_devs[i] == NULL) { 530 printf("Cannot determine installation device.\n"); 531 return 1; 532 } 533 534 return sysinst_install(default_devs[i]); 492 const char *dev = DEFAULT_DEV; 493 return sysinst_install(dev); 535 494 } 536 495
Note:
See TracChangeset
for help on using the changeset viewer.