0e2ab45d5e
- spec: cope with %{_modprobedir} being /lib/modprobe.d on SLE
- Add 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch
A temporary workaround until bsc#1197178 is resolved.
- Import commit 8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 (merge of v250.4)
For a complete list of changes, visit:
ca89b1d1fd...8ef8dfd540
- Import commit ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a
37b683c832 journal: preserve acls when rotating user journals with NOCOW attribute set
d043fabebc journal: when copying journal file to undo NOCOW flag, go via fd
78c2766689 journal-file: explicitly handle file systems that do not support hole punching
7ecfb4b098 journal-file: fix error handling of pread() in journald_file_punch_holes()
c4946a412c journal-file: don't use pread() when determining where to append, use mmap as before
d3fbd20628 journal: various fixes to journal_file_read_object()
5897a8e8d4 shared: Handle filesystems that don't support hole punching in COPY_HOLES
27746408e2 journal: Truncate file instead of punching hole in final object
59b6130030 shared: Ensure COPY_HOLES copies trailing holes
ac9ccba73f journal: stat journal file after truncating
0257283444 journal: Copy holes when archiving BTRFS journal files
26c2a9952d shared: Copy holes in sparse files in copy_bytes_full()
6c7191dece copy: fix wrong argument passed to S_ISREG() in copy_file_fd_full()
af0a43024d udev: 60-persistent-storage-tape.rules: handle duplicate device ID (bsc#1195529)
- Update Supplements to new format in baselibs.conf
- Fix libsystemd-shared exclusion in baselibs.conf
- Exclude new cryptsetup libraries in baselibs.conf
- systemd.spec: minor simplification by assuming that %{bootstrap} is always
OBS-URL: https://build.opensuse.org/request/show/964674
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=354
81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
From 9ab58f2dbcbbafc10a1b4de046a9b0e03bb08595 Mon Sep 17 00:00:00 2001
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Mon, 29 Oct 2012 13:01:20 +0000
|
|
Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they
|
|
aren't symlink
|
|
|
|
---
|
|
units/meson.build | 2 ++
|
|
units/var-lock.mount | 19 +++++++++++++++++++
|
|
units/var-run.mount | 19 +++++++++++++++++++
|
|
3 files changed, 40 insertions(+)
|
|
create mode 100644 units/var-lock.mount
|
|
create mode 100644 units/var-run.mount
|
|
|
|
diff --git a/units/meson.build b/units/meson.build
|
|
index a9bf28f6d9..739fd84d2c 100644
|
|
--- a/units/meson.build
|
|
+++ b/units/meson.build
|
|
@@ -165,6 +165,8 @@ units = [
|
|
['umount.target', ''],
|
|
['usb-gadget.target', ''],
|
|
['user.slice', ''],
|
|
+ ['var-run.mount', 'HAVE_SYSV_COMPAT', 'local-fs.target.wants/'],
|
|
+ ['var-lock.mount', 'HAVE_SYSV_COMPAT', 'local-fs.target.wants/'],
|
|
['var-lib-machines.mount', 'ENABLE_MACHINED',
|
|
'remote-fs.target.wants/ machines.target.wants/'],
|
|
['systemd-oomd.socket', 'ENABLE_OOMD'],
|
|
diff --git a/units/var-lock.mount b/units/var-lock.mount
|
|
new file mode 100644
|
|
index 0000000000..07277adac3
|
|
--- /dev/null
|
|
+++ b/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
|
|
diff --git a/units/var-run.mount b/units/var-run.mount
|
|
new file mode 100644
|
|
index 0000000000..ab4da424c9
|
|
--- /dev/null
|
|
+++ b/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
|
|
--
|
|
2.34.1
|
|
|