Changeset 89e2aac in mainline

Timestamp:

2017-07-08T17:06:34Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9bf4488

Parents:

1c88835

Message:

Fix sysinst.

Location:

uspace

Files:

• app/sysinst/sysinst.c (modified) (2 diffs)
• lib/fdisk/src/fdisk.c (modified) (2 diffs)

uspace/app/sysinst/sysinst.c

@@ -171 +171 @@
 
         printf("sysinst_fs_mount(): verify filesystem server result\n");
-        if (texit != TASK_EXIT_NORMAL || trc != 0)
-                return EIO;
+        if (texit != TASK_EXIT_NORMAL || trc != 0) {
+                printf("sysinst_fs_mount(): not successful, but could be already loaded.\n");
+        }
 
         rc = vfs_link_path(MOUNT_POINT, KIND_DIRECTORY, NULL);
@@ -209 +210 @@
 
         printf("sysinst_copy_boot_files(): verify filesystem server result\n");
-        if (texit != TASK_EXIT_NORMAL || trc != 0)
-                return EIO;
+        if (texit != TASK_EXIT_NORMAL || trc != 0) {
+                printf("sysinst_fs_mount(): not successful, but could be already loaded.\n");
+        }
 
         printf("sysinst_copy_boot_files(): create CD mount point\n");

uspace/lib/fdisk/src/fdisk.c

@@ -735 +735 @@
         vbd_part_id_t partid = 0;
         vol_part_info_t vpinfo;
-        char *label;
-        int rc;
-
-        label = str_dup(pspec->label);
-        if (label == NULL)
-                return ENOMEM;
+        const char *label;
+        int rc;
+
+        label = pspec->label != NULL ? pspec->label : "";
 
         rc = fdisk_part_spec_prepare(dev, pspec, &vpspec);
@@ -762 +760 @@
         if (part->svc_id != 0) {
                 rc = vol_part_mkfs(dev->fdisk->vol, part->svc_id, pspec->fstype,
-                    pspec->label);
+                    label);
                 if (rc != EOK && rc != ENOTSUP) {
                         rc = EIO;