]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
main: use correct cache file
authorRay Strode <rstrode@redhat.com>
Mon, 25 Feb 2013 19:41:48 +0000 (14:41 -0500)
committerRay Strode <rstrode@redhat.com>
Mon, 25 Feb 2013 19:42:48 +0000 (14:42 -0500)
Now that we allow switching into the initrd we shouldn't try
to load the boot cache file when shutting down.

src/main.c

index 5ce34a33e75b2344429d1d30d0f26967dcc675a3..e0d087c960d02883e57a0a2896dd5f9949d7a68f 100644 (file)
@@ -152,6 +152,7 @@ static void check_for_consoles (state_t    *state,
 static void toggle_between_splash_and_details (state_t *state);
 static void tell_systemd_to_print_details (state_t *state);
 static void tell_systemd_to_stop_printing_details (state_t *state);
+static const char * get_cache_file_for_mode (ply_mode_t mode);
 
 static void
 on_session_output (state_t    *state,
@@ -593,7 +594,7 @@ on_newroot (state_t    *state,
   chdir(root_dir);
   chroot(".");
   chdir("/");
-  ply_progress_load_cache (state->progress, BOOT_DURATION_FILE);
+  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);
 }