aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-05-28 22:34:55 +0200
committerTom Gundersen <teg@jklm.no>2012-05-29 12:48:18 +0200
commit9882b6ac728255b9e17c042b3c0d57cddd0d60d8 (patch)
treeddb874408da6afe04b0f58832561ea02d04306dc
parente09c66ded0f2d4888aafeca812dc972e52eb3972 (diff)
downloadinitscripts-9882b6ac728255b9e17c042b3c0d57cddd0d60d8.tar.xz
tmpfiles: let systemd-tools ship most tmpfiles.d entries
We only have one that is initsrcipts specific. Rename the tmpfiles snippet from arch.conf to initscripts.conf as this is more accurate. Signed-off-by: Tom Gundersen <teg@jklm.no>
-rw-r--r--Makefile2
-rw-r--r--tmpfiles.conf16
2 files changed, 1 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 7497f1c..14a4cb2 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ install: installdirs doc
install -m755 -t $(DESTDIR)/usr/sbin rc.d
install -m644 -t $(DESTDIR)/usr/share/man/man5 $(filter %.5, $(MAN_PAGES))
install -m644 -t $(DESTDIR)/usr/share/man/man8 $(filter %.8, $(MAN_PAGES))
- install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/arch.conf
+ install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/initscripts.conf
install -m644 -T bash-completion $(DESTDIR)/usr/share/bash-completion/completions/rc.d
install -m644 -T zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_rc.d
diff --git a/tmpfiles.conf b/tmpfiles.conf
index a63ca07..8f99a99 100644
--- a/tmpfiles.conf
+++ b/tmpfiles.conf
@@ -2,20 +2,4 @@
# /usr/lib/tmpfiles.d/arch.conf
#
-D /tmp 1777 root root 10d
d /run/daemons 0755 root root -
-
-d /tmp/.X11-unix 1777 root root 10d
-d /tmp/.ICE-unix 1777 root root 10d
-d /tmp/.XIM-unix 1777 root root 10d
-d /tmp/.font-unix 1777 root root 10d
-d /tmp/.Test-unix 1777 root root 10d
-
-F /run/utmp 0664 root utmp -
-
-r /tmp/.X[0-9]-lock
-r /etc/nologin
-r /etc/shutdownpid
-r /forcefsck
-r /fastboot
-