]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: use SPECIAL_DEFAULT_TARGET more
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 28 Nov 2019 08:13:45 +0000 (09:13 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 28 Nov 2019 08:13:45 +0000 (09:13 +0100)
src/run-generator/run-generator.c
src/sulogin-shell/sulogin-shell.c

index 7d6c1109125bb4ab80e46bdcb17a2f2f3aa63f39..a149b9c9c298e052e81021e3747356331b1b85bb 100644 (file)
@@ -9,6 +9,7 @@
 #include "generator.h"
 #include "mkdir.h"
 #include "proc-cmdline.h"
+#include "special.h"
 #include "specifier.h"
 #include "strv.h"
 
@@ -116,7 +117,7 @@ static int generate(void) {
                 return log_error_errno(r, "Failed to create unit file %s: %m", p);
 
         /* And now redirect default.target to our new target */
-        p = strjoina(arg_dest, "/default.target");
+        p = strjoina(arg_dest, "/" SPECIAL_DEFAULT_TARGET);
         if (symlink("kernel-command-line.target", p) < 0)
                 return log_error_errno(errno, "Failed to link unit file kernel-command-line.target → %s: %m", p);
 
index 6d65efbb9ea55ab691f1566bca06ba43ca48a5fe..9f90981e718b5e15e406a7699b326a43a677207b 100644 (file)
@@ -14,6 +14,7 @@
 #include "process-util.h"
 #include "sd-bus.h"
 #include "signal-util.h"
+#include "special.h"
 
 static int reload_manager(sd_bus *bus) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
@@ -57,7 +58,7 @@ static int start_default_target(sd_bus *bus) {
                                "StartUnit",
                                &error,
                                NULL,
-                               "ss", "default.target", "isolate");
+                               "ss", SPECIAL_DEFAULT_TARGET, "isolate");
 
         if (r < 0)
                 return log_error_errno(r, "Failed to start default target: %s", bus_error_message(&error, r));