diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | fixme | 2 | ||||
| -rw-r--r-- | units/tmpwatch.service | 21 | ||||
| -rw-r--r-- | units/tmpwatch.timer | 14 |
4 files changed, 41 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 3ab79ba875..b5b2a9d21c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -979,12 +979,16 @@ install-data-hook: dev-mqueue.automount \ proc-sys-fs-binfmt_misc.automount \ sys-kernel-debug.automount \ - sys-kernel-security.automount && \ + sys-kernel-security.automount \ + tmpwatch.timer \ + tmpwatch.service && \ $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \ $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \ $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \ $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \ - $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount ) + $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \ + $(LN_S) ../tmpwatch.timer && \ + $(LN_S) ../tmpwatch.service ) ( cd $(DESTDIR)$(dbussessionservicedir) && \ rm -f org.freedesktop.systemd1.service && \ $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) @@ -99,8 +99,6 @@ * properly handle bind mounts in /etc/fstab -* cleanup /tmp. - External: * place /etc/inittab with explaining blurb. diff --git a/units/tmpwatch.service b/units/tmpwatch.service new file mode 100644 index 0000000000..55f8f0ac03 --- /dev/null +++ b/units/tmpwatch.service @@ -0,0 +1,21 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Cleanup of Temporary Directories +DefaultDependencies=no +Wants=local-fs.target +After=local-fs.target +Before=poweroff.service reboot.service halt.service killall.service + +[Service] +Type=oneshot +ExecStart=/usr/sbin/tmpwatch -umc -x /tmp/.X11-unix -x /tmp/.ICE-unix 10d /tmp +ExecStart=/usr/sbin/tmpwatch -umc 30d /var/tmp + +[Install] +WantedBy=shutdown.target diff --git a/units/tmpwatch.timer b/units/tmpwatch.timer new file mode 100644 index 0000000000..222e3d238b --- /dev/null +++ b/units/tmpwatch.timer @@ -0,0 +1,14 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Daily Cleanup of Temporary Directories +DefaultDependency=no + +[Timer] +OnBootSec=1d +OnUnitActiveSec=1d |