Changeset ebb1489 in mainline for uspace/srv/volsrv/part.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/srv/volsrv/part.c (modified) (5 diffs)

uspace/srv/volsrv/part.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -52 +52 @@
 #include "types/part.h"
 #include "volume.h"
+#include "volsrv.h"
 
 static errno_t vol_part_add_locked(vol_parts_t *, service_id_t);
@@ -403 +404 @@
         part->cur_mp_auto = mp_auto;
 
+        if (str_cmp(mp, "/w") == 0) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Mounted system volume - "
+                    "loading additional configuration.");
+                rc = vol_volumes_merge_to(part->parts->volumes,
+                    vol_cfg_file);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Error loading "
+                            "additional configuration.");
+                        return rc;
+                }
+        }
+
         return rc;
 }
@@ -636 +649 @@
 
         if (part->cur_mp == NULL) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "Attempt to mount unmounted "
-                    "partition.");
-                return EINVAL;
+                /* Partition is not mounted, nothing to do. */
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Partition not mounted, "
+                    "nothing to do.");
+                goto done;
         }
 
@@ -659 +673 @@
         part->cur_mp = NULL;
         part->cur_mp_auto = false;
-
+done:
         return EOK;
 }