From: David Howells <dhowells@redhat.com>
Date: Thu, 1 Mar 2018 11:39:38 +0000 (+0000)
Subject: Differentiate kafs stuff by name
X-Git-Tag: v0.3~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e02aa1894e756b2799a9dd88ff60b258be103453;p=users%2Fdhowells%2Fkafs-client.git

Differentiate kafs stuff by name

Differentiate kafs and kafs toolage from other AFS tools by name so that
they can be installed and used in parallel.  To this end, use /kafs instead
of /afs as the mountpoint and rename aklog to aklog-kafs.

Signed-off-by: David Howells <dhowells@redhat.com>
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..34b3993
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+aklog-kafs
diff --git a/Makefile b/Makefile
index 15c08aa..c94ae46 100644
--- a/Makefile
+++ b/Makefile
@@ -37,9 +37,9 @@ endif
 # Build stuff
 #
 ###############################################################################
-all: aklog
+all: aklog-kafs
 
-aklog: aklog.c Makefile
+aklog-kafs: aklog-kafs.c Makefile
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lkrb5 -lcrypto -lkeyutils
 
 ###############################################################################
@@ -50,9 +50,9 @@ aklog: aklog.c Makefile
 MAN1	:= $(MANDIR)/man1
 
 install: all
-	$(INSTALL) -D -m 0755 aklog $(DESTDIR)$(BINDIR)/aklog
-	$(INSTALL) -D -m 0644 aklog.1 $(DESTDIR)$(MAN1)/aklog.1
-	mkdir -m755 $(DESTDIR)/afs
+	$(INSTALL) -D -m 0755 aklog-kafs $(DESTDIR)$(BINDIR)/aklog-kafs
+	$(INSTALL) -D -m 0644 aklog-kafs.1 $(DESTDIR)$(MAN1)/aklog-kafs.1
+	mkdir -m755 $(DESTDIR)/kafs
 
 ###############################################################################
 #
@@ -60,7 +60,7 @@ install: all
 #
 ###############################################################################
 clean:
-	$(RM) aklog
+	$(RM) aklog-kafs
 	$(RM) *.o *~
 	$(RM) debugfiles.list debugsources.list
 
diff --git a/aklog.1 b/aklog-kafs.1
similarity index 100%
rename from aklog.1
rename to aklog-kafs.1
diff --git a/aklog.c b/aklog-kafs.c
similarity index 100%
rename from aklog.c
rename to aklog-kafs.c
diff --git a/afs.mount b/kafs.mount
similarity index 55%
rename from afs.mount
rename to kafs.mount
index 207f3a7..a9c8e84 100644
--- a/afs.mount
+++ b/kafs.mount
@@ -1,10 +1,10 @@
 [Unit]
-Description=AFS Dynamic Root mount
-ConditionPathExists=/afs
+Description=kAFS Dynamic Root mount
+ConditionPathExists=/kafs
 
 [Mount]
 What=none
-Where=/afs
+Where=/kafs
 Type=afs
 Options=_netdev,dyn
 
diff --git a/redhat/kafs-client.spec b/redhat/kafs-client.spec
index d565552..ac7815e 100644
--- a/redhat/kafs-client.spec
+++ b/redhat/kafs-client.spec
@@ -3,7 +3,7 @@
 Name:		kafs-client
 Version:	0.1
 Release:	1%{?dist}%{?buildid}
-Summary:	kAFS basic tools and /afs dynamic root
+Summary:	kAFS basic tools and /kafs dynamic root
 License:	GPLv2+
 URL:		https://www.infradead.org/~dhowells/kafs/
 Source0:	https://www.infradead.org/~dhowells/kafs/kafs-client-%{version}.tar.bz2
@@ -25,7 +25,7 @@ Requires: selinux-policy-base >= 3.7.19-5
 
 %description
 Provide basic AFS-compatible tools for kAFS and mount the dynamic root
-on /afs.
+on /kafs.
 
 %global docdir %{_docdir}/kafs-client
 
@@ -50,20 +50,20 @@ make DESTDIR=%{buildroot} install \
 	MANDIR=%{_mandir} \
 	CFLAGS="-Wall $RPM_OPT_FLAGS -Werror"
 
-install -m 644 afs.mount %{buildroot}%{_unitdir}/afs.mount
+install -m 644 kafs.mount %{buildroot}%{_unitdir}/kafs.mount
 
 %post
-%systemd_post afs.mount
+%systemd_post kafs.mount
 
 %preun
-%systemd_preun afs.mount
+%systemd_preun kafs.mount
 
 %postun
-%systemd_postun_with_restart afs.mount
+%systemd_postun_with_restart kafs.mount
 
 %files
 %doc README
-/afs
+/kafs
 %{_bindir}/*
 %{_unitdir}/*
 %{_mandir}/*/*