Remove unnecessary code from csr-popup.[socket|service]

1. The csr-popup.service does not need to be running at boot time, so it removes the "Wants=csr-popup.service" from the csr-popup.socket.
2. You do not need "Sockets=" and "Service=" for sockets and services with the same prefix.
3. "Type=simple" is the systemd defaults, so we don't need it.

Change-Id: I4a282d27dff9a8591bf68b4ca9e9b1a41592a87d

diff --git a/systemd/csr-popup.service.in b/systemd/csr-popup.service.in
index d137834..82bfce4 100644 (file)
--- a/systemd/csr-popup.service.in
+++ b/systemd/csr-popup.service.in
@@ -2,7 +2,5 @@
 Description=CSR popup service for user session
 
 [Service]
-Type=simple
 EnvironmentFile=@POPUP_SERVICE_ENV_FILE_PATH@
 ExecStart=@BIN_DIR@/@SERVICE_NAME@-popup
-Sockets=@SERVICE_NAME@-popup.socket

diff --git a/systemd/csr-popup.socket.in b/systemd/csr-popup.socket.in
index a360f66..789b96a 100644 (file)
--- a/systemd/csr-popup.socket.in
+++ b/systemd/csr-popup.socket.in
@@ -1,11 +1,8 @@
 [Unit]
 Description= Csr popup socket
-Wants=@SERVICE_NAME@-popup.service
-Before=@SERVICE_NAME@-popup.service
 
 [Socket]
 ListenStream=/tmp/.@SERVICE_NAME@-popup.socket
-Service=@SERVICE_NAME@-popup.service
 SocketMode=0777
 
 [Install]