dlm: master - dlm: install dlm.service

David Teigland teigland at fedoraproject.org
Mon Jan 16 22:00:43 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=29703f020b15840ede1b9f9b5e04faafc2e69737
Commit:        29703f020b15840ede1b9f9b5e04faafc2e69737
Parent:        d5ccf4ff57f84aafc585be3d417cb8089586f97b
Author:        David Teigland <teigland at redhat.com>
AuthorDate:    Mon Jan 16 15:59:28 2012 -0600
Committer:     David Teigland <teigland at redhat.com>
CommitterDate: Mon Jan 16 15:59:47 2012 -0600

dlm: install dlm.service

Signed-off-by: David Teigland <teigland at redhat.com>
---
 dlm_controld/Makefile       |   29 +++++++++++++++++------------
 dlm_controld/dlm.service    |   11 -----------
 dlm_controld/dlm.service.in |   11 +++++++++++
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile
index 0e2e4da..66c0554 100644
--- a/dlm_controld/Makefile
+++ b/dlm_controld/Makefile
@@ -5,15 +5,14 @@ BINDIR=$(PREFIX)/sbin
 LIBDIR=$(PREFIX)/$(LIBNUM)
 HDRDIR=$(PREFIX)/include 
 MANDIR=$(PREFIX)/share/man
-INIDIR=/etc/init.d
+INITDIR=/etc/init.d
+UNITDIR=/lib/systemd/system
 
 BIN_TARGET = dlm_controld
-
 MAN_TARGET = dlm_controld.8
-
 HDR_TARGET = libdlmcontrol.h
-
-INI_TARGET = dlm
+INIT_TARGET = dlm
+UNIT_TARGET = dlm.service
 
 LIB_NAME = libdlmcontrol
 LIB_MAJOR = 3
@@ -33,7 +32,8 @@ BIN_SOURCE = action.c \
              logging.c \
              rbtree.c
 LIB_SOURCE = lib.c
-INI_SOURCE = dlm.in
+INIT_SOURCE = dlm.in
+UNIT_SOURCE = dlm.service.in
 
 BIN_CFLAGS += -D_GNU_SOURCE -g \
 	-Wall \
@@ -68,7 +68,7 @@ BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum
 LIB_CFLAGS += $(BIN_CFLAGS)
 LIB_LDFLAGS += -Wl,-z,relro -pie
 
-all: $(LIB_TARGET) $(BIN_TARGET) $(INI_TARGET)
+all: $(LIB_TARGET) $(BIN_TARGET) $(INIT_TARGET) $(UNIT_TARGET)
 
 $(BIN_TARGET): $(BIN_SOURCE)
 	$(CC) $(BIN_CFLAGS) $(BIN_LDFLAGS) $(BIN_SOURCE) -o $@ -L.
@@ -78,11 +78,14 @@ $(LIB_TARGET): $(LIB_SOURCE)
 	ln -sf $(LIB_TARGET) $(LIB_SO)
 	ln -sf $(LIB_TARGET) $(LIB_SMAJOR)
 
-$(INI_TARGET): $(INI_SOURCE)
-	cp $(INI_SOURCE) $(INI_TARGET)
+$(INIT_TARGET): $(INIT_SOURCE)
+	cp $(INIT_SOURCE) $(INIT_TARGET)
+
+$(UNIT_TARGET): $(UNIT_SOURCE)
+	cp $(UNIT_SOURCE) $(UNIT_TARGET)
 	
 clean:
-	rm -f *.o *.so *.so.* $(BIN_TARGET) $(LIB_TARGET) $(INI_TARGET)
+	rm -f *.o *.so *.so.* $(BIN_TARGET) $(LIB_TARGET) $(INIT_TARGET) $(UNIT_TARGET)
 
 
 INSTALL=$(shell which install)
@@ -92,13 +95,15 @@ install: all
 	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -d $(DESTDIR)/$(LIBDIR)
 	$(INSTALL) -d $(DESTDIR)/$(HDRDIR)
-	$(INSTALL) -d $(DESTDIR)/$(INIDIR)
+	$(INSTALL) -d $(DESTDIR)/$(INITDIR)
+	$(INSTALL) -d $(DESTDIR)/$(UNITDIR)
 	$(INSTALL) -d $(DESTDIR)/$(MANDIR)/man8
 	$(INSTALL) -c -m 755 $(BIN_TARGET) $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -c -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR)
 	cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR)
 	cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
 	$(INSTALL) -c -m 644 $(HDR_TARGET) $(DESTDIR)/$(HDRDIR)
-	$(INSTALL) -m 755 $(INI_TARGET) $(DESTDIR)/$(INIDIR)
+	$(INSTALL) -m 755 $(INIT_TARGET) $(DESTDIR)/$(INITDIR)
+	$(INSTALL) -m 755 $(UNIT_TARGET) $(DESTDIR)/$(UNITDIR)
 	$(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/
 
diff --git a/dlm_controld/dlm.service b/dlm_controld/dlm.service
deleted file mode 100644
index e275843..0000000
--- a/dlm_controld/dlm.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=dlm control daemon
-After=syslog.target network.target corosync.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/dlm_controld $OPTIONS
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/dlm_controld/dlm.service.in b/dlm_controld/dlm.service.in
new file mode 100644
index 0000000..e275843
--- /dev/null
+++ b/dlm_controld/dlm.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=dlm control daemon
+After=syslog.target network.target corosync.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/dlm_controld $OPTIONS
+
+[Install]
+WantedBy=multi-user.target
+


More information about the cluster-commits mailing list