core: drop references to Upstart

keszybz · keszybz · commit 54d04cd1e78b · 2021-02-07T17:02:56.000+01:00
The last release of Upstart was July 2014 [1], and there have been no new commits to the repo. We should move on too. [1] https://lists.ubuntu.com/archives/upstart-devel/2014-July/003313.html The only real support was in the code that looked for $PREVLEVEL. https://codesearch.debian.net/search?q=PREVLEVEL&literal=1&perpkg=1 shows this string in our own code (or the copy in elogind), our own man pages, and init scripts for two packages (brltty, salt), which shouldn't be used with systemd. (And both *check* for PREVLEVEL, and don't set it. So most likely nothing at all sets it.)
diff --git a/src/core/manager.c b/src/core/manager.c
@@ -510,7 +510,7 @@ static int manager_setup_signals(Manager *m) {
                         SIGCHLD,     /* Child died */
                         SIGTERM,     /* Reexecute daemon */
                         SIGHUP,      /* Reload configuration */
-                        SIGUSR1,     /* systemd/upstart: reconnect to D-Bus */
+                        SIGUSR1,     /* systemd: reconnect to D-Bus */
                         SIGUSR2,     /* systemd: dump status */
                         SIGINT,      /* Kernel sends us this on control-alt-del */
                         SIGWINCH,    /* Kernel sends us this on kbrequest (alt-arrowup) */
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
@@ -38,18 +38,10 @@ int utmp_get_runlevel(int *runlevel, int *previous) {
          * very new and not apply to the current script being executed. */
 
         e = getenv("RUNLEVEL");
-        if (e && e[0] > 0) {
+        if (!isempty(e)) {
                 *runlevel = e[0];
-
-                if (previous) {
-                        /* $PREVLEVEL seems to be an Upstart thing */
-
-                        e = getenv("PREVLEVEL");
-                        if (e && e[0] > 0)
-                                *previous = e[0];
-                        else
-                                *previous = 0;
-                }
+                if (previous)
+                        *previous = 0;
 
                 return 0;
         }
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
@@ -970,8 +970,8 @@ static int parse_argv(int argc, char *argv[]) {
                                 arg_action = _ACTION_INVALID;
                                 return telinit_parse_argv(argc, argv);
                         } else {
-                                /* Hmm, so some other init system is running, we need to forward this request to
-                                 * it. For now we simply guess that it is Upstart. */
+                                /* Hmm, so some other init system is running, we need to forward this request
+                                 * to it. */
 
                                 (void) rlimit_nofile_safe();
                                 execv(TELINIT, argv);
