forked from pool/systemd
6dd417b710
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/request/show/139993 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=111
98 lines
3.0 KiB
Diff
98 lines
3.0 KiB
Diff
Index: systemd-195/Makefile.am
|
|
===================================================================
|
|
--- systemd-195.orig/Makefile.am
|
|
+++ systemd-195/Makefile.am
|
|
@@ -294,6 +294,7 @@ dist_systemunit_DATA = \
|
|
units/sys-kernel-config.mount \
|
|
units/sys-kernel-debug.mount \
|
|
units/sys-fs-fuse-connections.mount \
|
|
+ units/var-run.mount \
|
|
units/tmp.mount \
|
|
units/printer.target \
|
|
units/sound.target \
|
|
@@ -308,6 +309,11 @@ dist_systemunit_DATA = \
|
|
units/systemd-udevd-kernel.socket \
|
|
units/system-update.target
|
|
|
|
+if HAVE_SYSV_COMPAT
|
|
+dist_systemunit_DATA += \
|
|
+ units/var-lock.mount
|
|
+endif
|
|
+
|
|
nodist_systemunit_DATA = \
|
|
units/getty@.service \
|
|
units/serial-getty@.service \
|
|
@@ -3864,9 +3870,11 @@ systemd-install-data-hook:
|
|
( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
|
|
rm -f systemd-remount-fs.service \
|
|
systemd-fsck-root.service \
|
|
+ var-run.mount \
|
|
tmp.mount && \
|
|
$(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
|
|
$(LN_S) ../systemd-fsck-root.service systemd-fsck-root.service && \
|
|
+ $(LN_S) ../var-run.mount var-run.mount && \
|
|
$(LN_S) ../tmp.mount tmp.mount )
|
|
( cd $(DESTDIR)$(userunitdir) && \
|
|
rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
|
|
@@ -3954,6 +3962,12 @@ if TARGET_MAGEIA
|
|
rm -f 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)
|
|
Index: systemd-195/units/var-lock.mount
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ systemd-195/units/var-lock.mount
|
|
@@ -0,0 +1,19 @@
|
|
+# 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
|
|
Index: systemd-195/units/var-run.mount
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ systemd-195/units/var-run.mount
|
|
@@ -0,0 +1,19 @@
|
|
+# 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
|