X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemctl.c;h=36346eebe86485c4e68168d64899f7f8018eaf48;hb=09adcdf71d762803b33bd2064a0fed56cf4072e4;hp=1735223e3ba8dadd187b19f6705d9acad80f9f0f;hpb=a4c279f87451186b8beb1b8cc21c7cad561ecf4b;p=elogind.git

diff --git a/src/systemctl.c b/src/systemctl.c
index 1735223e3..36346eebe 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -3731,12 +3731,12 @@ static int remove_marked_symlinks(const char *config_path) {
 
 static int create_symlink(const char *verb, const char *orig_old_path, const char *new_path) {
         int r;
-	const char *old_path;
+        const char *old_path;
 
-	if (arg_root)
-		old_path = orig_old_path+strlen(arg_root);
-	else
-		old_path = orig_old_path;
+        if (arg_root)
+                old_path = orig_old_path+strlen(arg_root);
+        else
+                old_path = orig_old_path;
 
         assert(old_path);
         assert(new_path);
@@ -3949,22 +3949,22 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo
 
         STRV_FOREACH(p, paths->unit_path) {
                 int fd;
-		char *path, *should_free;
+                char *path, *should_free;
 
-		if (arg_root)
-			should_free = path = strappend(arg_root, *p);
-		else {
-			should_free = NULL;
-			path = *p;
-		}
+                if (arg_root)
+                        should_free = path = strappend(arg_root, *p);
+                else {
+                        should_free = NULL;
+                        path = *p;
+                }
 
                 if (!(filename = path_make_absolute(i->name, path))) {
                         log_error("Out of memory");
                         return -ENOMEM;
                 }
 
-		if (should_free)
-			free(should_free);
+                if (should_free)
+                        free(should_free);
 
                 /* Ensure that we don't follow symlinks */
                 if ((fd = open(filename, O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NOCTTY)) >= 0)
@@ -4006,7 +4006,7 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo
                                 tmp_path = strappend (arg_root, sysv);
                                 exists = access (tmp_path, F_OK) >= 0;
                                 free (tmp_path);
-			} else
+                        } else
                                 exists = access(sysv, F_OK) >= 0;
 
                         if (exists) {
@@ -4030,7 +4030,7 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo
                                 if (arg_root)
                                         argv[3] = strappend("--root=", arg_root);
 
-	                        log_info("Executing %s %s %s %s", argv[0], argv[1], strempty(argv[2]), strempty(argv[3]));
+                                log_info("Executing %s %s %s %s", argv[0], argv[1], strempty(argv[2]), strempty(argv[3]));
 
                                 if ((pid = fork()) < 0) {
                                         log_error("Failed to fork: %m");
@@ -4139,7 +4139,7 @@ static int enable_unit(DBusConnection *bus, char **args, unsigned n) {
         dbus_error_init(&error);
 
         zero(paths);
-        if ((r = lookup_paths_init(&paths, arg_user ? MANAGER_USER : MANAGER_SYSTEM)) < 0) {
+        if ((r = lookup_paths_init(&paths, arg_user ? MANAGER_USER : MANAGER_SYSTEM, true)) < 0) {
                 log_error("Failed to determine lookup paths: %s", strerror(-r));
                 goto finish;
         }
@@ -4245,7 +4245,7 @@ static int systemctl_help(void) {
                "                      When queueing a new job, ignore all its dependencies\n"
                "     --kill-who=WHO   Who to send signal to\n"
                "  -s --signal=SIGNAL  Which signal to send\n"
-               "  -H --host=[user@]host\n"
+               "  -H --host=[USER@]HOST\n"
                "                      Show information for remote host\n"
                "  -P --privileged     Acquire privileges before execution\n"
                "  -q --quiet          Suppress output\n"
@@ -5112,7 +5112,7 @@ static int talk_upstart(void) {
                 goto finish;
         }
 
-        r = 0;
+        r = 1;
 
 finish:
         if (m)