Changes in uspace/app/sysinst/rdimg.c [a188131:fec7ba0] in mainline

File:

• uspace/app/sysinst/rdimg.c (modified) (13 diffs)

uspace/app/sysinst/rdimg.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -35 +35 @@
 #include <errno.h>
 #include <fibril.h>
-#include <io/log.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -61 +60 @@
         rc = vol_get_parts(vol, &part_ids, &nparts);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "Error getting list of volumes.");
+                printf("Error getting list of volumes.\n");
                 goto out;
         }
@@ -69 +67 @@
                 rc = vol_part_info(vol, part_ids[i], &vinfo);
                 if (rc != EOK) {
-                        log_msg(LOG_DEFAULT, LVL_ERROR,
-                            "Error getting volume information.");
+                        printf("Error getting volume information.\n");
                         rc = EIO;
                         goto out;
@@ -109 +106 @@
         int cnt;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "rd_img_open: begin");
-
+        printf("rd_img_open: begin\n");
         rdpath = str_dup("/vol/" RD_LABEL);
         if (rdpath == NULL) {
@@ -123 +119 @@
         }
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "rd_img_open: spawn file_bd");
+        printf("rd_img_open: spawn file_bd\n");
         rc = task_spawnl(&id, &wait, FILE_BD, FILE_BD, imgpath, RD_SVC, NULL);
         if (rc != EOK) {
@@ -130 +126 @@
         }
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "rd_img_open: wait for file_bd");
+        printf("rd_img_open: wait for file_bd\n");
         rc = task_wait(&wait, &texit, &retval);
         if (rc != EOK || texit != TASK_EXIT_NORMAL) {
@@ -138 +134 @@
 
         /* Wait for the RAM disk to become available */
-        log_msg(LOG_DEFAULT, LVL_NOTE,
-            "rd_img_open: wait for RAM disk to be mounted");
+        printf("rd_img_open: wait for RAM disk to be mounted\n");
         cnt = 10;
         while (cnt > 0) {
@@ -151 +146 @@
 
         if (cnt == 0) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "rd_img_open: ran out of time");
+                printf("rd_img_open: ran out of time\n");
                 rc = EIO;
                 goto error;
@@ -159 +154 @@
         *rimg = img;
         *rpath = rdpath;
-        log_msg(LOG_DEFAULT, LVL_NOTE, "rd_img_open: success");
+        printf("rd_img_open: success\n");
         return EOK;
 error:
@@ -178 +173 @@
         vol_t *vol = NULL;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "rd_img_close: begin");
+        printf("rd_img_close: begin\n");
 
         rc = vol_create(&vol);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "Error opening volume management service.");
-                rc = EIO;
-                goto error;
-        }
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "rd_img_close: Find RAM disk volume.");
+                printf("Error opening volume management service.\n");
+                rc = EIO;
+                goto error;
+        }
+
+        printf("rd_img_close: Find RAM disk volume.\n");
         rc = rd_img_part_by_label(vol, RD_LABEL, &rd_svcid);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "Error getting RAM disk service ID.");
-                rc = EIO;
-                goto error;
-        }
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "rd_img_close: eject RAM disk volume");
-        rc = vol_part_eject(vol, rd_svcid, vef_none);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "Error ejecting RAM disk volume.");
+                printf("Error getting RAM disk service ID.\n");
+                rc = EIO;
+                goto error;
+        }
+
+        printf("rd_img_close: eject RAM disk volume\n");
+        rc = vol_part_eject(vol, rd_svcid);
+        if (rc != EOK) {
+                printf("Error ejecting RAM disk volume.\n");
                 rc = EIO;
                 goto error;
@@ -210 +202 @@
         rc = task_kill(img->filebd_tid);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Error killing file_bd.");
+                printf("Error killing file_bd.\n");
                 rc = EIO;
                 goto error;
@@ -216 +208 @@
 
         free(img);
-        log_msg(LOG_DEFAULT, LVL_NOTE, "rd_img_close: success");
+        printf("rd_img_close: success\n");
         return EOK;
 error: