systemd: patch to fix https://bugs.freedesktop.org/show_bug.cgi?id=62354
This commit is contained in:
parent
f0ac823bfa
commit
f970f73224
4 changed files with 31 additions and 5 deletions
srcpkgs
1
srcpkgs/libudev/patches
Symbolic link
1
srcpkgs/libudev/patches
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
../systemd/patches
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'libudev'
|
# Template file for 'libudev'
|
||||||
pkgname=libudev
|
pkgname=libudev
|
||||||
version=198
|
version=198
|
||||||
revision=2
|
revision=5
|
||||||
wrksrc="systemd-${version}"
|
wrksrc="systemd-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--libexecdir=/usr/lib --disable-selinux
|
configure_args="--libexecdir=/usr/lib --disable-selinux
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
From c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lennart Poettering <lennart@poettering.net>
|
||||||
|
Date: Thu, 14 Mar 2013 20:36:38 +0000
|
||||||
|
Subject: main: don't mount /sys, /dev and friends when we run with PID != 1
|
||||||
|
|
||||||
|
Back from old times when we developed systemd on non-systemd hosts we
|
||||||
|
still mounted the missing directories such as the cgroup stuff even when
|
||||||
|
running with a PID != 1. There's no point for that anymore, so let's
|
||||||
|
just do that if we are actually PID 1, and never otherwise.
|
||||||
|
|
||||||
|
https://bugs.freedesktop.org/show_bug.cgi?id=62354
|
||||||
|
---
|
||||||
|
diff --git a/src/core/main.c b/src/core/main.c
|
||||||
|
index 7b03983..01a6d41 100644
|
||||||
|
--- src/core/main.c
|
||||||
|
+++ src/core/main.c
|
||||||
|
@@ -1437,7 +1437,7 @@ int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
|
/* Mount /proc, /sys and friends, so that /proc/cmdline and
|
||||||
|
* /proc/$PID/fd is available. */
|
||||||
|
- if (geteuid() == 0 && !getenv("SYSTEMD_SKIP_API_MOUNTS")) {
|
||||||
|
+ if (getpid() == 1) {
|
||||||
|
r = mount_setup(loaded_policy);
|
||||||
|
if (r < 0)
|
||||||
|
goto finish;
|
||||||
|
--
|
||||||
|
cgit v0.9.0.2-2-gbebe
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'systemd'
|
# Template file for 'systemd'
|
||||||
pkgname=systemd
|
pkgname=systemd
|
||||||
version=198
|
version=198
|
||||||
revision=4
|
revision=5
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--libexecdir=/usr/lib
|
configure_args="--libexecdir=/usr/lib
|
||||||
--disable-selinux --disable-tcpwrap --with-rootprefix=/usr
|
--disable-selinux --disable-tcpwrap --with-rootprefix=/usr
|
||||||
|
@ -46,9 +46,7 @@ if [ -n "$XBPS_CROSS_TRIPLET" ]; then
|
||||||
configure_args="${configure_args} --without-python --disable-gudev
|
configure_args="${configure_args} --without-python --disable-gudev
|
||||||
--enable-introspection=no
|
--enable-introspection=no
|
||||||
ac_cv_func_malloc_0_nonnull=yes
|
ac_cv_func_malloc_0_nonnull=yes
|
||||||
ac_cv_func_realloc_0_nonnull=yes
|
ac_cv_func_realloc_0_nonnull=yes"
|
||||||
PKG_CONFIG_SYSROOT_DIR=/usr/$XBPS_CROSS_TRIPLET
|
|
||||||
PKG_CONFIG_LIBDIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig"
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue