forked from pool/systemd
8d0e9d5913
- Add upstream patches for hwdb 0001-hwdb-keymaps-for-Samsung-900X3E-900X3F.patch 0002-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch 0003-keymap-Fix-HP-Pavillon-DV7.patch 0004-hwdb-update-format-description-and-document-reloadin.patch 0008-hwdb-update.patch - Port back and add the missed upstream patches from 2014/08/22 0004-login-set_controller-should-fail-if-prepare_vt-fails.patch 0006-login-share-VT-signal-handler-between-sessions.patch - Add upstream patches 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch 0002-switch-root-umount-the-old-root-correctly.patch 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch - man pages from section 3 are developer docs, move them to the -devel package. - Add patch 0001-let-systemctl-completion-ignore-at-names.patch to remove error messages for tab completion for systemctl isolate (bnc#892162) OBS-URL: https://build.opensuse.org/request/show/246497 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=200
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 7c96ab1d2484ab2df3c6a84f1a1d2e076f469085 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 13 Aug 2014 20:01:19 +0200
|
|
Subject: [PATCH] mount-setup: fix counting of early mounts without SMACK
|
|
|
|
http://lists.freedesktop.org/archives/systemd-devel/2014-August/021772.html
|
|
---
|
|
src/core/mount-setup.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git src/core/mount-setup.c src/core/mount-setup.c
|
|
index 206f89a..cc2633e 100644
|
|
--- src/core/mount-setup.c
|
|
+++ src/core/mount-setup.c
|
|
@@ -63,8 +63,13 @@ typedef struct MountPoint {
|
|
|
|
/* The first three entries we might need before SELinux is up. The
|
|
* fourth (securityfs) is needed by IMA to load a custom policy. The
|
|
- * other ones we can delay until SELinux and IMA are loaded. */
|
|
+ * other ones we can delay until SELinux and IMA are loaded. When
|
|
+ * SMACK is enabled we need smackfs, too, so it's a fifth one. */
|
|
+#ifdef HAVE_SMACK
|
|
#define N_EARLY_MOUNT 5
|
|
+#else
|
|
+#define N_EARLY_MOUNT 4
|
|
+#endif
|
|
|
|
static const MountPoint mount_table[] = {
|
|
{ "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
|
|
--
|
|
1.7.9.2
|
|
|