picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

units: get rid of var-run.mount and var-lock.mount

Browse source 
Since a number of distribitions don't need this compat glue anymore drop
it from systemd upstream. Distributions which still haven't converted
to /run can steal these unit files from the git history if they need to.
This commit is contained in:
Lennart Poettering 2012-03-27 17:11:00 +02:00
parent 231931ffba
commit 55d029addf
3 changed files with 2 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile.am
View file

@ -289,7 +289,6 @@ dist_systemunit_DATA = \
units/sys-kernel-config.mount \
units/sys-kernel-debug.mount \
units/sys-fs-fuse-connections.mount \
units/var-run.mount \
units/remount-rootfs.service \
units/printer.target \
units/sound.target \
@ -301,11 +300,6 @@ dist_systemunit_DATA = \
units/systemd-ask-password-console.path \
units/syslog.target
if HAVE_SYSV_COMPAT
dist_systemunit_DATA += \
units/var-lock.mount
endif
nodist_systemunit_DATA = \
units/getty@.service \
units/serial-getty@.service \
@ -2281,12 +2275,10 @@ systemd-install-data-hook:
( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
rm -f systemd-remount-api-vfs.service \
fsck-root.service \
remount-rootfs.service \
var-run.mount && \
remount-rootfs.service && \
$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
$(LN_S) ../fsck-root.service fsck-root.service && \
$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
$(LN_S) ../var-run.mount var-run.mount )
$(LN_S) ../remount-rootfs.service remount-rootfs.service )
( cd $(DESTDIR)$(userunitdir) && \
rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@ -2445,12 +2437,6 @@ if TARGET_MAGEIA
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if HAVE_SYSV_COMPAT
( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
rm -f var-lock.mount && \
$(LN_S) ../var-lock.mount var-lock.mount )
endif
install-exec-hook: $(INSTALL_EXEC_HOOKS)
uninstall-hook: $(UNINSTALL_EXEC_HOOKS)

19
units/var-lock.mount
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=Lock Directory
Before=local-fs.target
# skip mounting if the directory does not exist or is a symlink
ConditionPathIsDirectory=/var/lock
ConditionPathIsSymbolicLink=!/var/lock
[Mount]
What=/run/lock
Where=/var/lock
Type=bind
Options=bind

19
units/var-run.mount
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
Before=local-fs.target
# skip mounting if the directory does not exist or is a symlink
ConditionPathIsDirectory=/var/run
ConditionPathIsSymbolicLink=!/var/run
[Mount]
What=/run
Where=/var/run
Type=bind
Options=bind