From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Thu, 27 Mar 2014 19:53:21 +0000 (-0700)
Subject: main: don't write an empty file when no_boot_log is set
X-Git-Tag: 0.9.0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a55f32a04426407fddbe8a30d078eb70663c675f;p=thirdparty%2Fplymouth.git

main: don't write an empty file when no_boot_log is set

https://bugs.freedesktop.org/show_bug.cgi?id=76706
---

diff --git a/src/main.c b/src/main.c
index e8d852ed..71015ed6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -689,14 +689,17 @@ get_cache_file_for_mode (ply_mode_t mode)
 }
 
 static const char *
-get_log_file_for_mode (ply_mode_t mode)
+get_log_file_for_state (state_t *state)
 {
   const char *filename;
 
-  switch ((int)mode)
+  switch ((int)state->mode)
     {
     case PLY_MODE_BOOT:
-      filename = PLYMOUTH_LOG_DIRECTORY "/boot.log";
+      if (state->no_boot_log)
+	filename = NULL;
+      else
+	filename = PLYMOUTH_LOG_DIRECTORY "/boot.log";
       break;
     case PLY_MODE_SHUTDOWN:
     case PLY_MODE_UPDATES:
@@ -744,7 +747,7 @@ spool_error (state_t *state)
 
   ply_trace ("spooling error for viewer");
 
-  logfile = get_log_file_for_mode (state->mode);
+  logfile = get_log_file_for_state (state);
   logspool = get_log_spool_file_for_mode (state->mode);
 
   if (logfile != NULL && logspool != NULL)
@@ -772,7 +775,7 @@ prepare_logging (state_t *state)
       return;
     }
 
-  logfile = get_log_file_for_mode (state->mode);
+  logfile = get_log_file_for_state (state);
   if (logfile != NULL)
     {
       bool log_opened;