Changeset bb154c6 in mainline for uspace/srv/sysman/main.c

Timestamp:

2019-08-03T08:15:25Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

09a8006

Parents:

6006f35

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-04-15 15:14:58)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 08:15:25)

Message:

Add skeleton for configuration files loading

• Create content of /cfg directory,
• create sample configuration file,
• refactored polymorphism.

Conflicts:

boot/Makefile

File:

• uspace/srv/sysman/main.c (modified) (4 diffs)

uspace/srv/sysman/main.c

@@ -36 +36 @@
                 goto fail;
         }
+        mnt_initrd->name                 = str_dup("initrd.mnt");
         // TODO Use RDFMT
-        mnt_initrd->data.mnt.type       = str_dup("ext4fs");
-        mnt_initrd->data.mnt.mountpoint = str_dup("/");
-        mnt_initrd->data.mnt.device     = str_dup("bd/initrd");
+        CAST_MNT(mnt_initrd)->type       = str_dup("ext4fs");
+        CAST_MNT(mnt_initrd)->mountpoint = str_dup("/");
+        CAST_MNT(mnt_initrd)->device     = str_dup("bd/initrd");
 
         cfg_init = unit_create(UNIT_CONFIGURATION);
@@ -46 +47 @@
                 goto fail;
         }
-        cfg_init->data.cfg.path = str_dup("/cfg/");
+        cfg_init->name           = str_dup("init.cfg");
+        CAST_CFG(cfg_init)->path = str_dup("/cfg/sysman");
         
         tgt_default = unit_create(UNIT_TARGET);
@@ -53 +55 @@
                 goto fail;
         }
+        tgt_default->name = str_dup("default.tgt");
         
 
@@ -58 +61 @@
          * Add units to configuration and start the default target.
          */
+        configuration_start_update();
+
         configuration_add_unit(mnt_initrd);
         configuration_add_unit(cfg_init);