f37ad01569
- Configure split-usr=true only when %usrmerged is not defined
- Import commit 40bda18e346ff45132ccd6f8f8e96de78dcf3470 (merge of v249.4)
For a complete list of changes, visit:
7f23815a70...40bda18e34
- Rework the test (sub)package:
- it's been renamed into 'systemd-testsuite'
- it includes the extended tests too
- the relevant commits have been backported to SUSE/v249 so no SUSE
specific patch is needed to run the extended tests (see below)
- the deps needed by the extended tests have been added
- Import commit 7f23815a706cf2b2df3eac2eb2f8220736b8f427
ad216581b6 test: if haveged is part of initrd it needs to be installed in the image too
088fbb71d0 test: adapt install_pam() for openSUSE
4d631c1f0c Revert "test: adapt TEST-13-NSPAWN-SMOKE for SUSE"
ef956eb8a2 test: on openSUSE the static linked version of busybox is named "busybox-static"
6f7ce633b0 TEST-13-*: in busybox container sleep(1) takes a delay in seconds only
278baaa3ec test: don't try to find BUILD_DIR when NO_BUILD is set
3bba2f876a test: add support for NO_BUILD=1 on openSUSE
d77cbc1b64 test: make busybox TEST-13-only dependency
- Upgrade to v249.2 (commit c0bb2fcbc26f6aacde574656159504f263916719)
See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for
details.
- Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch
0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
- Configure split-usr=true only when %usrmerged is not defined
OBS-URL: https://build.opensuse.org/request/show/915488
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=335
81 lines
2.5 KiB
Diff
81 lines
2.5 KiB
Diff
From e78660b66efc6ab28b655ca584315504b76cb4dc 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 17e9ead9c1..7b926f9f91 100644
|
|
--- a/units/meson.build
|
|
+++ b/units/meson.build
|
|
@@ -160,6 +160,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/'],
|
|
]
|
|
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.26.2
|
|
|