proxmox-mirrors/systemd
1
0
Fork 0
mirror of https://git.proxmox.com/git/systemd synced 2026-01-22 13:30:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

units: get rid of special setup services for /var/run, /var/lock and /tmp, and rely on tmpfiles.d/ instead

Browse Source
This commit is contained in:
Lennart Poettering 2010-09-29 01:39:09 +02:00
parent afbf835326
commit 93ca9714e6
4 changed files with 2 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.am
View File

@ -181,11 +181,8 @@ dist_systemunit_DATA = \
units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
units/tmp.mount \
units/tmp.service \
units/var-lock.mount \
units/var-lock.service \
units/var-run.mount \
units/var-run.service \
units/hwclock-load.service \
units/hwclock-save.service \
units/sysctl.service \
@ -1003,15 +1000,11 @@ install-data-hook:
rm -f systemd-remount-api-vfs.service \
remount-rootfs.service \
var-run.mount \
var-run.service \
var-lock.mount \
var-lock.service && \
var-lock.mount && \
$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
$(LN_S) ../var-run.mount var-run.mount && \
$(LN_S) ../var-run.service var-run.service && \
$(LN_S) ../var-lock.mount var-lock.mount && \
$(LN_S) ../var-lock.service var-lock.service )
$(LN_S) ../var-lock.mount var-lock.mount )
( cd $(DESTDIR)$(sessionunitdir) && \
rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@ -1160,7 +1153,5 @@ git-tag:
# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
fedora: install
rm /lib/systemd/system/local-fs.target.wants/var-run.service
rm /lib/systemd/system/local-fs.target.wants/var-run.mount
rm /lib/systemd/system/local-fs.target.wants/var-lock.service
rm /lib/systemd/system/local-fs.target.wants/var-lock.mount

21
units/tmp.service
View File

@ -1,21 +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 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=Temporary Directory
DefaultDependencies=no
Requires=tmp.mount
After=tmp.mount
Before=local-fs.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/mkdir -p -m1777 /tmp/.X11-unix /tmp/.ICE-unix ; -/sbin/restorecon /tmp/.X11-unix /tmp/.ICE-unix
[Install]
WantedBy=local-fs.target

18
units/var-lock.service
View File

@ -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 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=Lock Directory
DefaultDependencies=no
Requires=var-lock.mount
After=var-lock.mount
Before=local-fs.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/mkdir -p /var/lock/subsys

19
units/var-run.service
View File

@ -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 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=Runtime Directory
DefaultDependencies=no
Requires=var-run.mount
After=var-run.mount
Before=local-fs.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/touch /var/run/utmp ; /bin/chmod 0664 /var/run/utmp ; /bin/chown root:utmp /var/run/utmp
ExecStart=/bin/mkdir /var/run/user ; /bin/chmod 0755 /var/run/user ; -/sbin/restorecon /var/run/user