Merge pull request #2473 from lucab/ups/prepare-root-less-global-mutable-state

This commit is contained in:
Jonathan Lebon 2021-10-26 13:25:37 -04:00 committed by GitHub
commit 6e0165020a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -81,9 +81,6 @@
#include "ostree-mount-util.h"
/* Initialized early in main */
static bool running_as_pid1;
static inline bool
sysroot_is_configured_ro (const char *sysroot)
{
@ -175,7 +172,7 @@ main(int argc, char *argv[])
* - Quiet logging as there's no journal
* etc.
*/
running_as_pid1 = (getpid () == 1);
bool running_as_pid1 = (getpid () == 1);
const char *root_arg = NULL;
bool we_mounted_proc = false;