Modify conf name from cleanup-storage to storage-cleanup

Change-Id: Ib42424fb0bb3b053c5fd5db2f61175e843c2b05b
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>
(cherry picked from commit aef0ea39aafd0c804bbc2b6b821ea0080435e816)

diff --git a/conf/sample-cleanup-storage.conf b/conf/sample-cleanup-storage.conf
deleted file mode 100644 (file)
index 47302f3..0000000
--- a/conf/sample-cleanup-storage.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-       "/opt":[
-               {
-                       "level":"critical",
-                       "path":"/opt/val/test",
-                       "target":"all",
-                       "except":[
-                               "/opt/val/test/except1",
-                               "/opt/val/test/except2"
-                       ]
-               }
-       ],
-       "/opt/usr":[
-               {
-                       "level":"warning",
-                       "path":"/opt/usr/etc/test/remain_root",
-                       "target":"file"
-               },
-               {
-                       "level":"warning",
-                       "path":"/opt/usr/etc/test/journal",
-                       "target":"all",
-                       "except":[
-                               "/opt/usr/etc/test/journal/except_dir",
-                               "/opt/usr/etc/test/journal/except_file"
-                       ]
-               },
-               {
-                       "level":"warning",
-                       "path":"/opt/usr/etc/test/delete"
-               },
-               {
-                       "level":"critical",
-                       "path":"/opt/usr/etc/test/critical"
-               },
-               {
-                       "level":"warning",
-                       "path":"/opt/usr/etc/test/log",
-                       "target":"oldfile",
-                       "except":[
-                               "/opt/usr/etc/test/log/exceptlog.1"
-                       ]
-               }
-       ]
-}

diff --git a/conf/storage-cleanup-sample.conf b/conf/storage-cleanup-sample.conf
new file mode 100644 (file)
index 0000000..47302f3
--- /dev/null
+++ b/conf/storage-cleanup-sample.conf
@@ -0,0 +1,45 @@
+{
+       "/opt":[
+               {
+                       "level":"critical",
+                       "path":"/opt/val/test",
+                       "target":"all",
+                       "except":[
+                               "/opt/val/test/except1",
+                               "/opt/val/test/except2"
+                       ]
+               }
+       ],
+       "/opt/usr":[
+               {
+                       "level":"warning",
+                       "path":"/opt/usr/etc/test/remain_root",
+                       "target":"file"
+               },
+               {
+                       "level":"warning",
+                       "path":"/opt/usr/etc/test/journal",
+                       "target":"all",
+                       "except":[
+                               "/opt/usr/etc/test/journal/except_dir",
+                               "/opt/usr/etc/test/journal/except_file"
+                       ]
+               },
+               {
+                       "level":"warning",
+                       "path":"/opt/usr/etc/test/delete"
+               },
+               {
+                       "level":"critical",
+                       "path":"/opt/usr/etc/test/critical"
+               },
+               {
+                       "level":"warning",
+                       "path":"/opt/usr/etc/test/log",
+                       "target":"oldfile",
+                       "except":[
+                               "/opt/usr/etc/test/log/exceptlog.1"
+                       ]
+               }
+       ]
+}

diff --git a/src/storage/cleanup_config.c b/src/storage/cleanup_config.c
index 8a1d82be555e4a263a067bab5a7e179d4026eabf..115c680346edcefe00d0292349dc737caaaf3edd 100644 (file)
--- a/src/storage/cleanup_config.c
+++ b/src/storage/cleanup_config.c
@@ -36,7 +36,7 @@ char *cleanup_target_str[] = {
        "oldfile"
 };
 
-#define DEF_CLEANUP_CONFIG_FILE     "/etc/storaged/cleanup-storage.conf"
+#define DEF_CLEANUP_CONFIG_FILE     "/etc/storaged/storage-cleanup.conf"
 #define RESULT(ret, val)       \
 { \
        if (ret)                                \