Changeset c7d0a6a4794f10a73d8c2cb103aa1c33c1b7ce69

Timestamp:

11/18/10 02:26:56 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

99b1ab0da40a97955655bceea29cfda375e8af67

Parents:

d027731b1848a3f06462a0aa71fd9e5926e14c9a

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-18T02:26:56Z+0200

Message:

ladishd: the reset of the previous commit

Files:

• daemon/loader.c (modified) (1 diff)

daemon/loader.c

@@ -307 +307 @@
   }
 
-  if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
-  {
-    argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
-  }
-  i++;
-
-  argv[i++] = "-c";
+  if (!run_in_terminal || strchr(commandline, '$') != NULL)
+  {
+    if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
+    {
+      argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
+    }
+    i++;
+
+    argv[i++] = "-c";
+  }
 
   argv[i++] = commandline;