Descrciption : Fixed the mistakes of rebase v231.

Change-Id: I9d770908f4e65d286756483b2e6b5909623949d7
Signed-off-by: Woochang Kim <wchang.kim@samsung.com>

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index cb08208..a979c50 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5738,7 +5738,7 @@ static int enable_unit(int argc, char *argv[], void *userdata) {
                 return 0;
 
         if (streq(verb, "enable")) {
-                if ( check_args_is_path(args+1) == 1 ) {
+                if ( check_args_is_path(argv+1) == 1 ) {
                         return 0;
                 }
         }
@@ -7215,15 +7215,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                 return -EINVAL;
         }
 
-        /* FIXME from systemd-216 of tizen-2.4 */
-        /* Now, in Tizen, some of services are hardly not
-         * terminated. At last, time-out occurred. It can make serious
-         * problem in shutdown process. Until we solve this problem
-         * reboot is performed forcedly. */
-        if (arg_action == ACTION_REBOOT ||
-            arg_action == ACTION_POWEROFF)
-                arg_force = 2;
-
         return 1;
 }
 
@@ -7319,6 +7310,15 @@ static int halt_parse_argv(int argc, char *argv[]) {
                 return -EINVAL;
         }
 
+        /* FIXME from systemd-216 of tizen-2.4 */
+        /* Now, in Tizen, some of services are hardly not
+         * terminated. At last, time-out occurred. It can make serious
+         * problem in shutdown process. Until we solve this problem
+         * reboot is performed forcedly. */
+        if (arg_action == ACTION_REBOOT ||
+            arg_action == ACTION_POWEROFF)
+                arg_force = 2;
+
         return 1;
 }
 

diff --git a/units/user@.service.m4.in b/units/user@.service.m4.in
index 273d8ae..ae38195 100644 (file)
--- a/units/user@.service.m4.in
+++ b/units/user@.service.m4.in
@@ -19,8 +19,8 @@ Slice=user-%i.slice
 KillMode=mixed
 Delegate=yes
 TasksMax=infinity
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
-Environment=XDG_RUNTIME_DIR=/run/user/%U
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%i/dbus/user_bus_socket
+Environment=XDG_RUNTIME_DIR=/run/user/%i
 Capabilities=cap_sys_admin,cap_mac_admin,cap_mac_override,cap_setgid,cap_dac_override=i
 SupplementaryGroups=priv_mediastorage priv_externalstorage priv_message_read priv_mapservice priv_network_get priv_internet
 SecureBits=keep-caps