Changeset 61f28c4 in mainline
- Timestamp:
- 2025-05-07T09:46:49Z (27 hours ago)
- Branches:
- master
- Children:
- 3599384, 4708060d
- Parents:
- 0cec807a
- git-author:
- Jiri Svoboda <jiri@…> (2025-05-06 17:46:39)
- git-committer:
- Jiri Svoboda <jiri@…> (2025-05-07 09:46:49)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/sysinst/sysinst.c
r0cec807a r61f28c4 158 158 static void sysinst_futil_create_dir(void *, const char *); 159 159 static errno_t sysinst_eject_dev(sysinst_t *, service_id_t); 160 static errno_t sysinst_eject_phys_by_mp(sysinst_t *, const char *); 160 161 161 162 static futil_cb_t sysinst_futil_cb = { … … 272 273 case 0: 273 274 /* OK */ 275 sysinst_action(sysinst, "Ejecting installation media."); 276 (void)sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT); 274 277 (void)sysinst_restart(sysinst); 275 278 break; … … 897 900 errno_t rc; 898 901 902 log_msg(LOG_DEFAULT, LVL_NOTE, 903 "sysinst_eject_phys_by_mp(%s)", path); 904 899 905 rc = vol_create(&vol); 900 906 if (rc != EOK) { … … 940 946 shutdown_failed = false; 941 947 948 sysinst_action(sysinst, "Restarting the system."); 949 942 950 rc = system_open(SYSTEM_DEFAULT, &sysinst_system_cb, NULL, &system); 943 951 if (rc != EOK) { … … 1023 1031 sysinst_action(sysinst, "Installing boot blocks."); 1024 1032 rc = sysinst_copy_boot_blocks(sysinst, dev); 1025 if (rc != EOK)1026 return rc;1027 1028 sysinst_action(sysinst, "Ejecting installation media.");1029 rc = sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT);1030 1033 if (rc != EOK) 1031 1034 return rc; … … 1070 1073 1071 1074 sysinst_progress_destroy(sysinst->progress); 1075 sysinst->progress = NULL; 1076 1072 1077 rc = sysinst_restart_dlg_create(sysinst); 1073 1078 if (rc != EOK) … … 1248 1253 static void sysinst_action(sysinst_t *sysinst, const char *action) 1249 1254 { 1255 log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action); 1256 1250 1257 if (sysinst->progress == NULL) 1251 1258 return; … … 1253 1260 ui_label_set_text(sysinst->progress->action, action); 1254 1261 ui_label_paint(sysinst->progress->action); 1255 log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);1256 1262 } 1257 1263
Note:
See TracChangeset
for help on using the changeset viewer.