Changeset df8eaba in mainline

Timestamp:

2018-10-06T21:14:14Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0bd66f5

Parents:

e88eb48

Message:

Let installer amend RAM disk image with volume server configuration.

Files:

• boot/Makefile (modified) (4 diffs)
• tools/mkext2.py (modified) (1 diff)
• uspace/app/sysinst/Makefile (modified) (2 diffs)
• uspace/app/sysinst/rdimg.c (added)
• uspace/app/sysinst/rdimg.h (added)
• uspace/app/sysinst/sysinst.c (modified) (4 diffs)
• uspace/app/sysinst/types/volume.h (added)
• uspace/app/sysinst/volume.c (added)
• uspace/app/sysinst/volume.h (added)
• uspace/srv/volsrv/volsrv.c (modified) (1 diff)
• uspace/srv/volsrv/volume.c (modified) (1 diff)

boot/Makefile

@@ -39 +39 @@
 build_dist: clean_dist
         mkdir -p "$(DIST_PATH)/app/"
-        mkdir -p "$(DIST_PATH)/cfg/net/"
-        mkdir -p "$(DIST_PATH)/data/cfg/"
+        mkdir -p "$(DIST_PATH)/cfg/"
+        mkdir -p "$(DIST_PATH)/data/"
         mkdir -p "$(DIST_PATH)/lib/"
         mkdir -p "$(DIST_PATH)/loc/"
@@ -48 +48 @@
         mkdir -p "$(DIST_PATH)/tmp/"
         mkdir -p "$(DIST_PATH)/vol/"
+        mkdir -p "$(DIST_PATH)/w/"
         for file in $(RD_SRVS) ; do \
                 cp "$$file" "$(DIST_PATH)/srv/" ; \
@@ -135 +136 @@
         rm -f $(INITRD).img $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE) $(COMPS).o $(COMPS)_desc.o $(COMPS).zip $(LINK)
         find $(USPACE_PATH)/dist -mindepth 1 -maxdepth 1 -type f -exec rm \{\} \;
+        rm -f $(USPACE_PATH)/dist/app/*
+        rm -f $(USPACE_PATH)/dist/cfg/*
         rm -f $(USPACE_PATH)/dist/srv/*
         rm -rf $(USPACE_PATH)/dist/drv/*
@@ -142 +145 @@
         rm -f $(USPACE_PATH)/dist/test/*
         rm -f $(USPACE_PATH)/dist/cfg/net/*
+        rm -f $(USPACE_PATH)/dist/w/*

tools/mkext2.py

@@ -310 +310 @@
                 sb.features_read_only = 0
                 sb.uuid = self.uuid.bytes_le
-                sb.volume_name = 'HelenOS rdimage\0'
+                sb.volume_name = 'HelenOS-rd\0\0\0\0\0\0'
                 self.outf.write(bytes(sb.pack()))
 

uspace/app/sysinst/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-LIBS = block fdisk
+LIBS = block fdisk sif
 
 BINARY = sysinst
@@ -34 +34 @@
 SOURCES = \
         futil.c \
-        sysinst.c
+        rdimg.c \
+        sysinst.c \
+        volume.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/sysinst/sysinst.c

@@ -51 +51 @@
 #include "futil.h"
 #include "grub.h"
+#include "rdimg.h"
+#include "volume.h"
 
 /** Device to install to
@@ -64 +66 @@
 /** Volume label for the new file system */
 #define INST_VOL_LABEL "HelenOS"
+/** Mount point of system partition when running installed system */
+#define INST_VOL_MP "/w"
 
 #define MOUNT_POINT "/inst"
@@ -173 +177 @@
         printf("sysinst_copy_boot_files(): OK\n");
         return EOK;
+}
+
+/** Set up configuration in the initial RAM disk.
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_customize_initrd(void)
+{
+        errno_t rc;
+        rd_img_t *rd = NULL;
+        char *rdpath = NULL;
+        char *path = NULL;
+        vol_volumes_t *volumes = NULL;
+        vol_volume_t *volume = NULL;
+        int rv;
+
+        rc = rd_img_open(MOUNT_POINT "/boot/initrd.img", &rdpath, &rd);
+        if (rc != EOK) {
+                printf("Error opening initial RAM disk image.\n");
+                goto error;
+        }
+
+        rv = asprintf(&path, "%s%s", rdpath, "/cfg/volsrv.sif");
+        if (rv < 0) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        printf("Configuring volume server.\n");
+        rc = vol_volumes_create(path, &volumes);
+        if (rc != EOK) {
+                printf("Error creating volume server configuration.\n");
+                rc = EIO;
+                goto error;
+        }
+
+        printf("Configuring volume server: look up volume\n");
+        rc = vol_volume_lookup_ref(volumes, INST_VOL_LABEL, &volume);
+        if (rc != EOK) {
+                printf("Error creating volume server configuration.\n");
+                rc = EIO;
+                goto error;
+        }
+
+        printf("Configuring volume server: set mount point\n");
+        rc = vol_volume_set_mountp(volume, INST_VOL_MP);
+        if (rc != EOK) {
+                printf("Error creating system partition configuration.\n");
+                rc = EIO;
+                goto error;
+        }
+
+        printf("Configuring volume server: delete reference\n");
+        vol_volume_del_ref(volume);
+        volume = NULL;
+        printf("Configuring volume server: destroy volumes object\n");
+        vol_volumes_destroy(volumes);
+        volumes = NULL;
+
+        rc = rd_img_close(rd);
+        if (rc != EOK) {
+                printf("Error closing initial RAM disk image.\n");
+                rc = EIO;
+                goto error;
+        }
+
+        free(rdpath);
+        rdpath = NULL;
+        free(path);
+        path = NULL;
+
+        return EOK;
+error:
+        if (volume != NULL)
+                vol_volume_del_ref(volume);
+        if (volumes != NULL)
+                vol_volumes_destroy(volumes);
+        if (rd != NULL)
+                (void) rd_img_close(rd);
+        if (path != NULL)
+                free(path);
+        if (rdpath != NULL)
+                free(rdpath);
+        return rc;
 }
 
@@ -332 +420 @@
                 return rc;
 
+        printf("Boot files done. Configuring the system.\n");
+        rc = sysinst_customize_initrd();
+        if (rc != EOK)
+                return rc;
+
         printf("Boot files done. Installing boot blocks.\n");
         rc = sysinst_copy_boot_blocks(dev);

uspace/srv/volsrv/volsrv.c

@@ -53 +53 @@
 #define NAME  "volsrv"
 
-const char *vol_cfg_file = "/data/cfg/volsrv.sif";
+const char *vol_cfg_file = "/cfg/volsrv.sif";
 
 static void vol_client_conn(ipc_call_t *, void *);

uspace/srv/volsrv/volume.c

@@ -205 +205 @@
         }
 
+        (void) sif_close(volumes->repo);
         free(volumes);
 }