From: Ray Strode <rstrode@redhat.com>
Date: Thu, 26 Apr 2018 14:45:39 +0000 (-0400)
Subject: main: don't load cache or treat root as mounted on shutdown
X-Git-Tag: 0.9.4~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55186d76ab699b8c2f536b87874a2fc628612fbd;p=thirdparty%2Fplymouth.git

main: don't load cache or treat root as mounted on shutdown

Right now, anytime we update the root fs in the daemon we treat
it like we switched from initramfs to the main root filesystem.

We shoudn't do that when shutting down since we're going to go
the other direction.

This commit changes on_newroot to look at the current mode to
decide what to do.

For the moment it doesn't do anything in the shutdown case, but
that will change shortly.
---

diff --git a/src/main.c b/src/main.c
index f1e0fa7c..70cacd7b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -718,9 +718,17 @@ on_newroot (state_t    *state,
         chdir (root_dir);
         chroot (".");
         chdir ("/");
-        ply_progress_load_cache (state->progress, get_cache_file_for_mode (state->mode));
-        if (state->boot_splash != NULL)
-                ply_boot_splash_root_mounted (state->boot_splash);
+
+        switch ((int) state->mode) {
+        case PLY_MODE_BOOT:
+        case PLY_MODE_UPDATES:
+                ply_progress_load_cache (state->progress, get_cache_file_for_mode (state->mode));
+                if (state->boot_splash != NULL)
+                        ply_boot_splash_root_mounted (state->boot_splash);
+                break;
+        case PLY_MODE_SHUTDOWN:
+                break;
+        }
 }
 
 static const char *