Changeset 8d74fdd in mainline for uspace/srv/sysman/main.c

Timestamp:

2019-08-17T13:57:05Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

f92b315

Parents:

be07995

git-author:

Michal Koutný <xm.koutny+hos@…> (2016-01-27 00:01:13)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-17 13:57:05)

Message:

sysman: Shutdown operation as shutdown.tgt isolation

Since not all dependencies are captured by graph, sysman and taskman are
ignored when stopping servers, so that they can complete the shutdown
transition.

Conflicts:

boot/Makefile.common

File:

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

uspace/srv/sysman/main.c

@@ -38 +38 @@
 #include <taskman.h>
 
-#include "repo.h"
 #include "connection_broker.h"
 #include "connection_ctl.h"
@@ -44 +43 @@
 #include "job_queue.h"
 #include "log.h"
+#include "repo.h"
+#include "sm_task.h"
 #include "sysman.h"
-#include "sm_task.h"
 #include "unit.h"
 
 #define NAME "sysman"
-
-#define INITRD_DEVICE       "bd/initrd"
-#define INITRD_MOUNT_POINT  "/"
-#define INITRD_CFG_PATH     "/cfg/sysman"
-
-#define TARGET_INIT     "initrd.tgt"
-#define TARGET_ROOTFS   "rootfs.tgt"
-#define TARGET_DEFAULT  "default.tgt"
-
-#define UNIT_MNT_INITRD "initrd.mnt"
-#define UNIT_CFG_INITRD "init.cfg"
-
 
 static const char *target_sequence[] = {
@@ -195 +183 @@
         }
 
-        int rc = sysman_run_job(tgt, STATE_STARTED, &sequence_job_handler,
+        int rc = sysman_run_job(tgt, STATE_STARTED, 0, &sequence_job_handler,
             target_name_ptr);