fix and mv service into systemd dir

sonald · May 12, 2014 · 92e69f8 · 92e69f8
1 parent 1d409b3
commit 92e69f8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,8 +36,8 @@ include_directories(${FT2_INCLUDE_DIRS})
 
 
 configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h)
-configure_file(${PROJECT_SOURCE_DIR}/prometheus-quit.service.in 
-    ${PROJECT_BINARY_DIR}/prometheus-quit.service)
+configure_file(${PROJECT_SOURCE_DIR}/systemd/prometheus-quit.service.in 
+    ${PROJECT_BINARY_DIR}/systemd/prometheus-quit.service)
 
 set(SRCS atlas.cc driver.cc glutil.cc options.cc scene.cc)
 
@@ -74,6 +74,6 @@ install(FILES initrd/prometheus.initrd_hook
 install(FILES initrd/prometheus.initrd_install
     DESTINATION lib/initcpio/install RENAME prometheus)
 # quit service
-install(FILES ${PROJECT_BINARY_DIR}/prometheus-quit.service
+install(FILES ${PROJECT_BINARY_DIR}/systemd/prometheus-quit.service
     DESTINATION /usr/lib/systemd/system 
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
diff --git a/client.cc b/client.cc
@@ -57,11 +57,6 @@ int main(int argc, char *argv[])
     dispatch(argv[1]);
     close(id);
 
-    ofstream ofs{"/tmp/prometheus.done"};
-    ofs << "";
-
-    // bad way to wait for server to finish
-    sleep(1);
     return 0;
 }
 
diff --git a/lightdm-prometheus.service b/lightdm-prometheus.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Light Display Manager
-Conflicts[email protected] prometheus-quit.service
+Conflicts[email protected]
 After=systemd-user-sessions.service [email protected] prometheus-quit.service
 
 [Service]

diff --git a/prometheus-quit.service.in → systemd/prometheus-quit.service.in b/prometheus-quit.service.in → systemd/prometheus-quit.service.in