Fix default configuration file installation location

Open-webOS-DCO-1.0-Signed-off-by: Pekka Ropo <[email protected]>

Change-Id: I5e7ee638f4efc84224398d2643d6ed160e7a19e2

Author: pekkaropo-owo

CMakeLists.txt

@@ -96,4 +96,4 @@ webos_build_daemon()
 webos_build_system_bus_files()
 
 install(PROGRAMS scripts/public/suspend_action DESTINATION ${WEBOS_INSTALL_SBINDIR})
-install(FILES files/conf/sleepd.conf DESTINATION ${WEBOS_INSTALL_LOCALSTATEDIR}/preferences)
+install(FILES files/conf/sleepd.conf DESTINATION ${WEBOS_INSTALL_DEFAULTCONFDIR})

files/launch/sleepd.in

@@ -27,19 +27,6 @@ start on stopped finish
 stop on started start_update
 
 respawn
-
-pre-start script
-    CONF_DIR="@WEBOS_INSTALL_LOCALSTATEDIR@/preferences/com.palm.sleep"
-    CONF_FILE="${CONF_DIR}/sleepd.conf"
-    DEFAULT_CONF_FILE="@WEBOS_INSTALL_DEFAULTCONFDIR@/sleepd.conf"
-    TMP_FILE="${CONF_DIR}/sleepd.tmp"
-    if [ ! -f ${CONF_FILE} ]; then
-        mkdir -p ${CONF_DIR} || true
-        cp ${DEFAULT_CONF_FILE} ${TMP_FILE} || true
-        sync || true
-        mv ${TMP_FILE} ${CONF_FILE} || true
-    fi
-end script
 
 service
 exec @WEBOS_INSTALL_SBINDIR@/sleepd

include/internal/main.h

@@ -27,8 +27,6 @@
 #include <luna-service2/lunaservice.h>
 #include <nyx/nyx_client.h>
 
-#define PREFERENCE_DIR "/var/preferences/com.palm.sleep"
-
 GMainContext * GetMainLoopContext(void);
 
 LSHandle * GetLunaServiceHandle(void);

src/alarms/alarm.c

@@ -40,6 +40,7 @@
 
 #include "main.h"
 #include "logging.h"
+#include "config.h"
 #include "timeout_alarm.h"
 
 #define LOG_DOMAIN "ALARM: "
@@ -681,7 +682,7 @@ alarm_queue_create(void)
     gAlarmQueue->seq_id = 0;
 
     gAlarmQueue->alarm_db =
-        g_build_filename(PREFERENCE_DIR, "alarms.xml", NULL);
+        g_build_filename(gSleepConfig.preference_dir, "alarms.xml", NULL);
 
     return 0;
 }

src/alarms/timeout_alarm.c

@@ -67,12 +67,11 @@
 
 #define STD_ASCTIME_BUF_SIZE	26
 
-// FIXME: database path should be based on gPowerConfig.preference_dir
-#define TIMEOUT_DATABASE_NAME "/var/preferences/com.palm.sleep/SysTimeouts.db"
-
 // This allows testing the SQL commands to add the new columns. Set to false for production code
 #define CREATE_DB_WITHOUT_ACTIVITY_COLUMNS 0
 
+#define TIMEOUT_DATABASE_NAME "SysTimeouts.db"
+
 typedef enum {
     AlarmTimeoutRelative,
     AlarmTimeoutCalendar,
@@ -82,7 +81,6 @@ static LSPalmService *psh = NULL;
 static sqlite3 *timeout_db = NULL;
 static GTimerSource *sTimerCheck = NULL;
 
-static const char* kSysTimeoutDatabaseName = TIMEOUT_DATABASE_NAME;
 /*
    Database Schema.
 
@@ -1289,29 +1287,27 @@ _alarms_timeout_init(void)
 {
     bool retVal;
 
+    gchar* timeout_db_name = g_build_filename(gSleepConfig.preference_dir, TIMEOUT_DATABASE_NAME, NULL);
+
     if (gSleepConfig.disable_rtc_alarms)
 	{
 		SLEEPDLOG(LOG_INFO, "%s: RTC alarms disabled", __FUNCTION__);
 		return 0;
 	}
 
-    /* Set up database */
-    const char* ptr = strrchr( kSysTimeoutDatabaseName, '/' );
-    gchar* filename = g_filename_from_utf8( kSysTimeoutDatabaseName, ptr-kSysTimeoutDatabaseName, 0, 0, 0);
-    if (!filename) {
-        goto error;
-    }
-
-    g_mkdir_with_parents(filename, S_IRWXU);
-    g_free(filename);
+    gchar* timeout_db_path = g_path_get_dirname(timeout_db_name);
+    g_mkdir_with_parents(timeout_db_path, S_IRWXU);
+    g_free(timeout_db_path);
 
-    retVal = smart_sql_open( kSysTimeoutDatabaseName, &timeout_db );
+    retVal = smart_sql_open( timeout_db_name, &timeout_db );
     if( !retVal ) {
         SLEEPDLOG(LOG_ERR,"Failed to open database %s\n",
-                kSysTimeoutDatabaseName );
+                timeout_db_name );
         goto error;
     }
 
+    g_free(timeout_db_name);
+
     retVal = smart_sql_exec( timeout_db, kSysTimeoutDatabaseCreateSchema );
     if( !retVal ) {
         SLEEPDLOG(LOG_ERR, "%s could not create database\n", __FUNCTION__);

src/config.c.in

@@ -111,8 +111,9 @@ config_init(void)
         return -1;
     }
 
+// Load default values from configuration file
     char *config_path =
-        g_build_filename(gSleepConfig.preference_dir, "sleepd.conf", NULL);
+        g_build_filename("@WEBOS_INSTALL_DEFAULTCONFDIR@", "sleepd.conf", NULL);
     retVal = g_key_file_load_from_file(config_file, config_path,
         G_KEY_FILE_NONE, NULL);
     if (!retVal)

src/utils/timesaver.c

@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <string.h>
 
+#include "config.h"
 #include "logging.h"
 #include "main.h"
 
@@ -49,9 +50,9 @@ timesaver_save()
 	if (!time_db)
     {
 		time_db = g_build_filename(
-				PREFERENCE_DIR, "time_saver", NULL);
+				gSleepConfig.preference_dir, "time_saver", NULL);
 		time_db_tmp = g_build_filename(
-				PREFERENCE_DIR, "time_saver.tmp", NULL);
+				gSleepConfig.preference_dir, "time_saver.tmp", NULL);
     }
 
     if (NULL == time_db)