commit: 97e3616a927367df8a3d96379f06b73aac39fbae
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 22:31:16 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 22:31:59 2016 +0000
URL:
https://gitweb.gentoo.org/proj/gentoo-systemd-integration.git/commit/?id=97e3616a
Drop var-lock.mount and var-run.mount
Makefile.am | 11 -----------
configure.ac | 5 -----
mounts/var-lock.mount | 19 -------------------
mounts/var-run.mount | 19 -------------------
4 files changed, 54 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c0bbe5e..4482c77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,9 +8,6 @@ dist_sysctl_DATA = \
sysctl.d/60-gentoo.conf
dist_tmpfiles_DATA = \
tmpfiles.d/gentoo-run.conf
-dist_systemdsystemunit_DATA = \
- mounts/var-lock.mount \
- mounts/var-run.mount
dist_systemdsystempreset_DATA = \
system-preset/99-default.preset
dist_systemdsystemgenerator_SCRIPTS = \
@@ -19,14 +16,6 @@ dist_systemdsystemgenerator_SCRIPTS = \
udevrulesdir = $(udevdir)/rules.d
dist_udevrules_DATA = udev/40-gentoo.rules
-install-data-hook: \
- systemd-system-unit-install-hook
-
-systemd-system-unit-install-hook:
- mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants
- $(LN_S) ../var-lock.mount ../var-run.mount \
- $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/
-
DISTCLEANFILES = \
$(systemdsystemunit_DATA)
diff --git a/configure.ac b/configure.ac
index d8d6b2a..abe9705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,11 +9,6 @@ AC_PROG_SED
# https://bitbucket.org/mgorny/systemd-m4/
SYSTEMD_MISC
-SYSTEMD_SYSTEMUNITDIR
-if test -z "$systemdsystemunitdir"; then
- AC_MSG_ERROR([systemdsystemunitdir must be set])
-fi
-
SYSTEMD_SYSTEMGENERATORDIR
if test -z "$systemdsystemgeneratordir"; then
AC_MSG_ERROR([systemdsystemgeneratordir must be set])
diff --git a/mounts/var-lock.mount b/mounts/var-lock.mount
deleted file mode 100644
index 07277ad..0000000
--- a/mounts/var-lock.mount
+++ /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 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
diff --git a/mounts/var-run.mount b/mounts/var-run.mount
deleted file mode 100644
index ab4da42..0000000
--- a/mounts/var-run.mount
+++ /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 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
