make command::working_directory optional

sorokin · Mar 9, 2014 · 4018bb6 · 4018bb6
1 parent a0fd84d
commit 4018bb6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 27 deletions.
diff --git a/demo.conf b/demo.conf
@@ -2,29 +2,25 @@ task print_hello = start_stop
 {
     start = command
     {
-        cmd               = "/bin/echo 'welcome to initd demo'",
-        working_directory = "/"
+        cmd = "/bin/echo 'welcome to initd demo'",
     },
 
     stop = command
     {
-        cmd               = "/bin/false",
-        working_directory = "/"
+        cmd = "/bin/false",
     },
 };
 
 task print_hostname_before = start_stop
 {
     start = command
     {
-        cmd               = "/bin/hostname",
-        working_directory = "/"
+        cmd = "/bin/hostname",
     },
 
     stop = command
     {
-        cmd               = "/bin/hostname",
-        working_directory = "/"
+        cmd = "/bin/hostname",
     },
 };
 
@@ -38,59 +34,51 @@ task print_hostname_after = start_stop
 {
     start = command
     {
-        cmd               = "/bin/hostname",
-        working_directory = "/"
+        cmd = "/bin/hostname",
     },
 
     stop = command
     {
-        cmd               = "/bin/hostname",
-        working_directory = "/"
+        cmd = "/bin/hostname",
     },
 };
 
 task task_1 = start_stop
 {
     start = command
     {
-        cmd               = "/bin/echo 'task 1 started'",
-        working_directory = "/"
+        cmd = "/bin/echo 'task 1 started'",
     },
 
     stop = command
     {
-        cmd               = "/bin/echo 'task 1 stopped'",
-        working_directory = "/"
+        cmd = "/bin/echo 'task 1 stopped'",
     },
 };
 
 task task_2 = start_stop
 {
     start = command
     {
-        cmd               = "/bin/echo 'task 2 started'",
-        working_directory = "/"
+        cmd = "/bin/echo 'task 2 started'",
     },
 
     stop = command
     {
-        cmd               = "/bin/echo 'task 2 stopped'",
-        working_directory = "/"
+        cmd = "/bin/echo 'task 2 stopped'",
     },
 };
 
 task task_3 = start_stop
 {
     start = command
     {
-        cmd               = "/bin/echo 'task 3 started'",
-        working_directory = "/"
+        cmd = "/bin/echo 'task 3 started'",
     },
 
     stop = command
     {
-        cmd               = "/bin/echo 'task 3 stopped'",
-        working_directory = "/"
+        cmd = "/bin/echo 'task 3 stopped'",
     },
 };
 

diff --git a/libinitd-readconfig/read_value_node/read_value_node_tasks.cpp b/libinitd-readconfig/read_value_node/read_value_node_tasks.cpp
@@ -177,14 +177,14 @@ boost::optional<command> read_value_node_impl<command>::read(value_node const& n
     std::multimap<std::string, property_node*> properties_by_name = make_properties_map(cnode, esink);
 
     boost::optional<cmd_line> cmd = extract_property_from_map<cmd_line>(cnode, properties_by_name, "cmd", esink);
-    boost::optional<std::string> working_directory = extract_property_from_map<std::string>(cnode, properties_by_name, "working_directory", esink);
-    if (!cmd || !working_directory)
+    std::string working_directory = extract_property_from_map<std::string>(cnode, properties_by_name, "working_directory", "/", esink);
+    if (!cmd)
         return boost::none;
 
     command data;
 
     data.cmd = *cmd;
-    data.working_directory = *working_directory;
+    data.working_directory = working_directory;
 
     return data;
 }

diff --git a/test-config/config_tests/task-hostname-5.gold b/test-config/config_tests/task-hostname-5.gold
@@ -0,0 +1,5 @@
+task a = sethostname
+{
+    hostname   = "localhost"
+    no_restore = false
+}
diff --git a/test-config/config_tests/task-hostname-5.txt b/test-config/config_tests/task-hostname-5.txt
@@ -0,0 +1,4 @@
+task a = sethostname
+{
+    hostname = "localhost"
+};