From 81f65d60a3d9dd533d978dd11558109e8ebe2956 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 3 Apr 2015 18:27:17 +0200 Subject: [PATCH] remove tmpfiles --- tmpfiles.d/.gitignore | 2 -- tmpfiles.d/Makefile | 1 - tmpfiles.d/etc.conf.m4 | 19 --------------- tmpfiles.d/legacy.conf | 35 --------------------------- tmpfiles.d/systemd-nologin.conf | 11 --------- tmpfiles.d/systemd-remote.conf | 11 --------- tmpfiles.d/systemd.conf.m4 | 42 --------------------------------- tmpfiles.d/tmp.conf | 18 -------------- tmpfiles.d/var.conf | 23 ------------------ tmpfiles.d/x11.conf | 18 -------------- 10 files changed, 180 deletions(-) delete mode 100644 tmpfiles.d/.gitignore delete mode 120000 tmpfiles.d/Makefile delete mode 100644 tmpfiles.d/etc.conf.m4 delete mode 100644 tmpfiles.d/legacy.conf delete mode 100644 tmpfiles.d/systemd-nologin.conf delete mode 100644 tmpfiles.d/systemd-remote.conf delete mode 100644 tmpfiles.d/systemd.conf.m4 delete mode 100644 tmpfiles.d/tmp.conf delete mode 100644 tmpfiles.d/var.conf delete mode 100644 tmpfiles.d/x11.conf diff --git a/tmpfiles.d/.gitignore b/tmpfiles.d/.gitignore deleted file mode 100644 index 4f0ecaa9c..000000000 --- a/tmpfiles.d/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/etc.conf -/systemd.conf diff --git a/tmpfiles.d/Makefile b/tmpfiles.d/Makefile deleted file mode 120000 index bd1047548..000000000 --- a/tmpfiles.d/Makefile +++ /dev/null @@ -1 +0,0 @@ -../src/Makefile \ No newline at end of file diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 deleted file mode 100644 index ab5cd16f2..000000000 --- a/tmpfiles.d/etc.conf.m4 +++ /dev/null @@ -1,19 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -# See tmpfiles.d(5) for details - -L /etc/os-release - - - - ../usr/lib/os-release -L /etc/localtime - - - - ../usr/share/zoneinfo/UTC -L+ /etc/mtab - - - - ../proc/self/mounts -m4_ifdef(`ENABLE_RESOLVED', -L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf -)m4_dnl -C /etc/nsswitch.conf - - - - -m4_ifdef(`HAVE_PAM', -C /etc/pam.d - - - - -)m4_dnl diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf deleted file mode 100644 index 32196723f..000000000 --- a/tmpfiles.d/legacy.conf +++ /dev/null @@ -1,35 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -# See tmpfiles.d(5) for details - -# These files are considered legacy and are unnecessary on legacy-free -# systems. - -d /run/lock 0755 root root - -L /var/lock - - - - ../run/lock - -# /run/lock/subsys is used for serializing SysV service execution, and -# hence without use on SysV-less systems. - -d /run/lock/subsys 0755 root root - - -# /run/lock/lockdev is used to serialize access to tty devices via -# LCK..xxx style lock files, For more information see: -# http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html -# On modern systems a BSD file lock is a better choice if -# serialization is needed on those devices. - -d /run/lock/lockdev 0775 root lock - - -# /forcefsck, /fastboot and /forcequotecheck are deprecated in favor of the -# kernel command line options 'fsck.mode=force', 'fsck.mode=skip' and -# 'quotacheck.mode=force' - -r! /forcefsck -r! /fastboot -r! /forcequotacheck diff --git a/tmpfiles.d/systemd-nologin.conf b/tmpfiles.d/systemd-nologin.conf deleted file mode 100644 index d61232b53..000000000 --- a/tmpfiles.d/systemd-nologin.conf +++ /dev/null @@ -1,11 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -# See tmpfiles.d(5) and systemd-forbid-user-logins.service(5). -# This file has special suffix so it is not run by mistake. - -F! /run/nologin 0644 - - - "System is booting up. See pam_nologin(8)" diff --git a/tmpfiles.d/systemd-remote.conf b/tmpfiles.d/systemd-remote.conf deleted file mode 100644 index 1b8973a88..000000000 --- a/tmpfiles.d/systemd-remote.conf +++ /dev/null @@ -1,11 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -# See tmpfiles.d(5) for details - -z /var/log/journal/remote 2755 root systemd-journal-remote - - -z /run/log/journal/remote 2755 root systemd-journal-remote - - diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4 deleted file mode 100644 index b447b01f5..000000000 --- a/tmpfiles.d/systemd.conf.m4 +++ /dev/null @@ -1,42 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -# See tmpfiles.d(5) for details - -d /run/user 0755 root root - -F! /run/utmp 0664 root utmp - - -d /run/systemd/ask-password 0755 root root - -d /run/systemd/seats 0755 root root - -d /run/systemd/sessions 0755 root root - -d /run/systemd/users 0755 root root - -d /run/systemd/machines 0755 root root - -d /run/systemd/shutdown 0755 root root - -m4_ifdef(`ENABLE_NETWORKD', -d /run/systemd/netif 0755 systemd-network systemd-network - -d /run/systemd/netif/links 0755 systemd-network systemd-network - -d /run/systemd/netif/leases 0755 systemd-network systemd-network - -)m4_dnl - -d /run/log 0755 root root - - -z /run/log/journal 2755 root systemd-journal - - -Z /run/log/journal/%m ~2750 root systemd-journal - - -m4_ifdef(`HAVE_ACL',`` -a+ /run/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x -A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x -'')m4_dnl - -z /var/log/journal 2755 root systemd-journal - - -z /var/log/journal/%m 2755 root systemd-journal - - -m4_ifdef(`HAVE_ACL',`` -a+ /var/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x -A+ /var/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x -'')m4_dnl - -d /var/lib/systemd 0755 root root - -d /var/lib/systemd/coredump 0755 root root 3d diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf deleted file mode 100644 index ffdd82fd9..000000000 --- a/tmpfiles.d/tmp.conf +++ /dev/null @@ -1,18 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -# See tmpfiles.d(5) for details - -# Clear tmp directories separately, to make them easier to override -v /tmp 1777 root root 10d -v /var/tmp 1777 root root 30d - -# Exclude namespace mountpoints created with PrivateTmp=yes -x /tmp/systemd-private-%b-* -X /tmp/systemd-private-%b-*/tmp -x /var/tmp/systemd-private-%b-* -X /var/tmp/systemd-private-%b-*/tmp diff --git a/tmpfiles.d/var.conf b/tmpfiles.d/var.conf deleted file mode 100644 index 9b7644476..000000000 --- a/tmpfiles.d/var.conf +++ /dev/null @@ -1,23 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -# See tmpfiles.d(5) for details - -d /var 0755 - - - - -L /var/run - - - - ../run - -d /var/log 0755 - - - -f /var/log/wtmp 0664 root utmp - -f /var/log/btmp 0600 root utmp - - -d /var/cache 0755 - - - - -d /var/lib 0755 - - - -v /var/lib/machines 0700 - - - - -d /var/spool 0755 - - - diff --git a/tmpfiles.d/x11.conf b/tmpfiles.d/x11.conf deleted file mode 100644 index 4c96a54a1..000000000 --- a/tmpfiles.d/x11.conf +++ /dev/null @@ -1,18 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -# See tmpfiles.d(5) for details - -# Make sure these are created by default so that nobody else can -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 - -# Unlink the X11 lock files -r! /tmp/.X[0-9]*-lock -- 2.30.2