From d5ecdde02e27619f47e0f301de1eea8337c377a6 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 21 May 2012 19:48:04 +0200
Subject: [PATCH] main: rename a few fix to follow general naming style
 (cherry picked from commit
 2660882b52ae1a5d97a2344633a999d88a3cd45b)

---
 src/core/main.c |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/core/main.c b/src/core/main.c
index 3e1d4dd..e06db54 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -751,7 +751,7 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_SHOW_STATUS,
                 ARG_SYSV_CONSOLE,
                 ARG_DESERIALIZE,
-                ARG_SWITCHEDROOT,
+                ARG_SWITCHED_ROOT,
                 ARG_INTROSPECT,
                 ARG_DEFAULT_STD_OUTPUT,
                 ARG_DEFAULT_STD_ERROR
@@ -776,7 +776,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "sysv-console",             optional_argument, NULL, ARG_SYSV_CONSOLE             },
 #endif
                 { "deserialize",              required_argument, NULL, ARG_DESERIALIZE              },
-                { "switchedroot",             no_argument,       NULL, ARG_SWITCHEDROOT             },
+                { "switched-root",            no_argument,       NULL, ARG_SWITCHED_ROOT            },
                 { "introspect",               optional_argument, NULL, ARG_INTROSPECT               },
                 { "default-standard-output",  required_argument, NULL, ARG_DEFAULT_STD_OUTPUT,      },
                 { "default-standard-error",   required_argument, NULL, ARG_DEFAULT_STD_ERROR,       },
@@ -948,7 +948,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
                 }
 
-                case ARG_SWITCHEDROOT:
+                case ARG_SWITCHED_ROOT:
                         /* Nothing special yet */
                         break;
 
@@ -1188,7 +1188,7 @@ int main(int argc, char *argv[]) {
         const char *shutdown_verb = NULL;
         dual_timestamp initrd_timestamp = { 0ULL, 0ULL };
         static char systemd[] = "systemd";
-        bool is_reexec = false;
+        bool skip_setup = false;
         int j;
         bool loaded_policy = false;
         bool arm_reboot_watchdog = false;
@@ -1209,17 +1209,17 @@ int main(int argc, char *argv[]) {
         /* Determine if this is a reexecution or normal bootup. We do
          * the full command line parsing much later, so let's just
          * have a quick peek here. */
-
         for (j = 1; j < argc; j++)
                 if (streq(argv[j], "--deserialize")) {
-                        is_reexec = true;
+                        skip_setup = true;
                         break;
                 }
 
-        /* If we have switched root, do all the special things */
+        /* If we have switched root, do all the special setup
+         * things */
         for (j = 1; j < argc; j++)
-                if (streq(argv[j], "--switchedroot")) {
-                        is_reexec = false;
+                if (streq(argv[j], "--switched-root")) {
+                        skip_setup = false;
                         break;
                 }
 
@@ -1254,7 +1254,7 @@ int main(int argc, char *argv[]) {
                 arg_running_as = MANAGER_SYSTEM;
                 log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_JOURNAL : LOG_TARGET_JOURNAL_OR_KMSG);
 
-                if (!is_reexec) {
+                if (!skip_setup) {
                         if (selinux_setup(&loaded_policy) < 0)
                                 goto finish;
                         if (ima_setup() < 0)
@@ -1266,7 +1266,7 @@ int main(int argc, char *argv[]) {
                 if (label_init(NULL) < 0)
                         goto finish;
 
-                if (!is_reexec)
+                if (!skip_setup)
                         if (hwclock_is_localtime() > 0) {
                                 int min;
 
@@ -1378,7 +1378,7 @@ int main(int argc, char *argv[]) {
                 /* Parse the data passed to us. We leave this
                  * variables set, but the manager later on will not
                  * pass them on to our children. */
-                if(!in_initrd())
+                if (!in_initrd())
                         parse_initrd_timestamp(&initrd_timestamp);
 
                 /* Unset some environment variables passed in from the
@@ -1392,7 +1392,7 @@ int main(int argc, char *argv[]) {
                 unsetenv("SHLVL");
                 unsetenv("_");
 
-                /* When we are invoked by a tool chroot-like such as
+                /* When we are invoked by a chroot-like tool such as
                  * nspawn, these might be set, but make little sense
                  * to pass on */
                 unsetenv("USER");
@@ -1419,7 +1419,7 @@ int main(int argc, char *argv[]) {
         /* Reset the console, but only if this is really init and we
          * are freshly booted */
         if (arg_running_as == MANAGER_SYSTEM && arg_action == ACTION_RUN) {
-                console_setup(getpid() == 1 && !is_reexec);
+                console_setup(getpid() == 1 && !skip_setup);
                 make_null_stdio();
         }
 
@@ -1440,7 +1440,7 @@ int main(int argc, char *argv[]) {
         log_full(arg_running_as == MANAGER_SYSTEM ? LOG_INFO : LOG_DEBUG,
                  PACKAGE_STRING " running in %s mode. (" SYSTEMD_FEATURES "; " DISTRIBUTION ")", manager_running_as_to_string(arg_running_as));
 
-        if (arg_running_as == MANAGER_SYSTEM && !is_reexec) {
+        if (arg_running_as == MANAGER_SYSTEM && !skip_setup) {
                 locale_setup();
 
                 if (arg_show_status || plymouth_running())
@@ -1677,7 +1677,7 @@ finish:
                         i = 0;
                         args[i++] = SYSTEMD_BINARY_PATH;
                         if (switch_root_dir)
-                                args[i++] = "--switchedroot";
+                                args[i++] = "--switched-root";
                         args[i++] = arg_running_as == MANAGER_SYSTEM ? "--system" : "--user";
                         args[i++] = "--deserialize";
                         args[i++] = sfd;