Prep v235: optimize elogind extra startup functionality

1 files changed, 4 insertions, 17 deletions

diff --git a/src/login/logind.c b/src/login/logind.c
index 5cc118ae9..996be1e47 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1281,23 +1281,10 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-#if 1 /// elogind allows to be daemonized using one argument "-D" / "--daemon"
-        if (argc == 2) {
-
-                if (!argv[1] || (0 == strlen(argv[1]))
-                  || ( !streq(argv[1], "-D")
-                    && !streq(argv[1], "--daemon") ) ) {
-                        fprintf(stderr, "%s [-D|--daemon]\n", argv[0]);
-                        r = -EINVAL;
-                        goto finish;
-                }
-
-                r = elogind_daemonize();
-                if (r)
-                        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;;
-
-                argc = 1; /* Use the rest of main() as usual */
-        }
+#if 1 /// elogind has some extra functionality at startup.
+        r = elogind_startup(argc, argv);
+        if (r)
+                return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 #endif // 1
 
         if (argc != 1) {