From: Hyotaek Shim <hyotaek.shim@samsung.com>
Date: Tue, 3 May 2022 08:25:25 +0000 (+0900)
Subject: Rearrange conf source files
X-Git-Tag: submit/tizen/20220525.001052~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F274605%2F3;p=platform%2Fcore%2Fsystem%2Fstoraged.git

Rearrange conf source files

Change-Id: I4f19473c89f2de56d49902a043c9a0e97884f954
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b1321c..74162b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${${PROJECT_NAME}_pkgs_LDFLAGS} "-ldl" "-l
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/conf/org.tizen.system.storage.conf DESTINATION /etc/dbus-1/system.d)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/conf/block.conf DESTINATION /etc/storaged)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/conf/storage.conf DESTINATION /etc/storaged)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/systemd/org.tizen.system.storage.service DESTINATION /usr/share/dbus-1/system-services)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/systemd/ DESTINATION lib/systemd/system
 	FILES_MATCHING
diff --git a/conf/block.conf b/conf/block.conf
new file mode 100644
index 0000000..d27c779
--- /dev/null
+++ b/conf/block.conf
@@ -0,0 +1,12 @@
+[Block]
+
+[MMC]
+Multimount=no # yes or no
+ExtendedInternalStorage=yes # yes or no
+
+[SCSI]
+Multimount=yes # yes or no
+
+[Mapper]
+Multimount=no
+ExtendedInternalStorage=yes
\ No newline at end of file
diff --git a/conf/sample-cleanup-storage.conf b/conf/sample-cleanup-storage.conf
new file mode 100644
index 0000000..47302f3
--- /dev/null
+++ b/conf/sample-cleanup-storage.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/conf/storage.conf b/conf/storage.conf
new file mode 100644
index 0000000..331e786
--- /dev/null
+++ b/conf/storage.conf
@@ -0,0 +1,7 @@
+[LOWSTORAGE]
+#5%
+WARNING_LEVEL=5
+#0.1%
+CRITICAL_LEVEL=0.1
+#0.0%
+FULL_LEVEL=0
diff --git a/src/block/CMakeLists.txt b/src/block/CMakeLists.txt
index f72f5e3..9694e78 100644
--- a/src/block/CMakeLists.txt
+++ b/src/block/CMakeLists.txt
@@ -58,5 +58,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${${PROJECT_NAME}_pkgs_LDFLAGS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/storaged COMPONENT RuntimeLibraries)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/block.conf DESTINATION /etc/storaged)
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/mmc-smack-label DESTINATION bin)
diff --git a/src/block/block.conf b/src/block/block.conf
deleted file mode 100644
index d27c779..0000000
--- a/src/block/block.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[Block]
-
-[MMC]
-Multimount=no # yes or no
-ExtendedInternalStorage=yes # yes or no
-
-[SCSI]
-Multimount=yes # yes or no
-
-[Mapper]
-Multimount=no
-ExtendedInternalStorage=yes
\ No newline at end of file
diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt
index 60674c5..4e8c38b 100644
--- a/src/storage/CMakeLists.txt
+++ b/src/storage/CMakeLists.txt
@@ -35,5 +35,3 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${${PROJECT_NAME}_pkgs_LDFLAGS})
 
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/storaged COMPONENT RuntimeLibraries)
-
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/storage.conf DESTINATION /etc/storaged)
diff --git a/src/storage/sample-cleanup-storage.conf b/src/storage/sample-cleanup-storage.conf
deleted file mode 100644
index 47302f3..0000000
--- a/src/storage/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/src/storage/storage.conf b/src/storage/storage.conf
deleted file mode 100644
index 331e786..0000000
--- a/src/storage/storage.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[LOWSTORAGE]
-#5%
-WARNING_LEVEL=5
-#0.1%
-CRITICAL_LEVEL=0.1
-#0.0%
-FULL_LEVEL=0