This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via a8aa3ead4367dba690c7944f9a118e0cd10796c3 (commit)
from 392f2153b04208281b6af0b011fd6327dbfe0ca2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a8aa3ead4367dba690c7944f9a118e0cd10796c3
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Jul 6 19:56:14 2012 +0200
systemd: Update to 186.
Minor update to latest version.
Move libudev.h and libudev.so to libudev-devel.
Fixes #10179 and #10180.
-----------------------------------------------------------------------
Summary of changes:
...185-avoid-redundant-vt-clearing-by-agetty.patch | 28 --
.../systemd-185-remove-plymouth-files.patch | 416 --------------------
.../systemd-185-udev-accept-rd-parameters.patch | 131 ------
...d-185-udev-fix-after-udev-trigger.service.patch | 22 -
...85-udev-remove-remaining-selinux-labeling.patch | 43 --
systemd/systemd.nm | 7 +-
6 files changed, 4 insertions(+), 643 deletions(-)
delete mode 100644 systemd/patches/systemd-185-avoid-redundant-vt-clearing-by-agetty.patch
delete mode 100644 systemd/patches/systemd-185-remove-plymouth-files.patch
delete mode 100644 systemd/patches/systemd-185-udev-accept-rd-parameters.patch
delete mode 100644 systemd/patches/systemd-185-udev-fix-after-udev-trigger.service.patch
delete mode 100644 systemd/patches/systemd-185-udev-remove-remaining-selinux-labeling.patch
Difference in files:
diff --git a/systemd/patches/systemd-185-avoid-redundant-vt-clearing-by-agetty.patch b/systemd/patches/systemd-185-avoid-redundant-vt-clearing-by-agetty.patch
deleted file mode 100644
index f4d22bf..0000000
--- a/systemd/patches/systemd-185-avoid-redundant-vt-clearing-by-agetty.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3305d6806d428010b1cd2abd716aa1bb7f81311f Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt(a)redhat.com>
-Date: Wed, 06 Jun 2012 09:26:30 +0000
-Subject: units: avoid redundant VT clearing by agetty
-
-TTYVTDisallocate=yes already clears the VT. agetty does not need to do
-it again. Run it with --noclear.
-
-Felix Miata found the double clearing confusing in this bugreport:
-https://bugzilla.redhat.com/show_bug.cgi?id=828007
-Add a comment explaining what clears the VT.
----
-diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
-index 6d45836..fcf1de1 100644
---- a/units/getty@.service.m4
-+++ b/units/getty@.service.m4
-@@ -41,7 +41,8 @@ ConditionPathExists=/dev/tty0
-
- [Service]
- Environment=TERM=linux
--ExecStart=-/sbin/agetty %I 38400
-+# the VT is cleared by TTYVTDisallocate
-+ExecStart=-/sbin/agetty --noclear %I 38400
- Type=idle
- Restart=always
- RestartSec=0
---
-cgit v0.9.0.2-2-gbebe
diff --git a/systemd/patches/systemd-185-remove-plymouth-files.patch b/systemd/patches/systemd-185-remove-plymouth-files.patch
deleted file mode 100644
index 092b838..0000000
--- a/systemd/patches/systemd-185-remove-plymouth-files.patch
+++ /dev/null
@@ -1,416 +0,0 @@
-From 26cbf29c52a36b6ad9d1ccc16d8f7adccefeddca Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay(a)vrfy.org>
-Date: Thu, 07 Jun 2012 17:27:17 +0000
-Subject: delete plymouth units; moved to plymouth
-
----
-diff --git a/Makefile.am b/Makefile.am
-index 6cc352a..f45fa27 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -425,25 +425,6 @@ systemgenerator_PROGRAMS += \
- systemd-rc-local-generator
- endif
-
--if HAVE_PLYMOUTH
--dist_systemunit_DATA += \
-- units/plymouth-start.service \
-- units/plymouth-read-write.service \
-- units/plymouth-quit.service \
-- units/plymouth-quit-wait.service \
-- units/plymouth-reboot.service \
-- units/plymouth-kexec.service \
-- units/plymouth-poweroff.service \
-- units/plymouth-halt.service \
-- units/systemd-ask-password-plymouth.path
--
--nodist_systemunit_DATA += \
-- units/systemd-ask-password-plymouth.service
--
--EXTRA_DIST += \
-- units/systemd-ask-password-plymouth.service.in
--endif
--
- dist_doc_DATA = \
- README \
- NEWS \
-@@ -3249,33 +3230,6 @@ systemd-install-data-hook:
- ( cd $(DESTDIR)$(dbussessionservicedir) && \
- rm -f org.freedesktop.systemd1.service && \
- $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
--if HAVE_PLYMOUTH
-- $(MKDIR_P) -m 0755 \
-- $(DESTDIR)$(systemunitdir)/reboot.target.wants \
-- $(DESTDIR)$(systemunitdir)/kexec.target.wants \
-- $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
-- $(DESTDIR)$(systemunitdir)/halt.target.wants
-- ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-- rm -f plymouth-start.service plymouth-read-write.service && \
-- $(LN_S) ../plymouth-start.service plymouth-start.service && \
-- $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
-- ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-- rm -f plymouth-quit.service plymouth-quit-wait.service && \
-- $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
-- $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
-- ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
-- rm -f plymouth-reboot.service && \
-- $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
-- ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
-- rm -f plymouth-kexec.service && \
-- $(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
-- ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
-- rm -f plymouth-poweroff.service && \
-- $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
-- ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
-- rm -f plymouth-halt.service && \
-- $(LN_S) ../plymouth-halt.service plymouth-halt.service )
--endif
- if TARGET_MEEGO
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-diff --git a/README b/README
-index d922204..d23a3d6 100644
---- a/README
-+++ b/README
-@@ -60,7 +60,6 @@ REQUIREMENTS:
-
- util-linux > v2.18 (requires fsck -l, agetty -s)
- sulogin (from sysvinit-tools, optional but recommended)
-- plymouth (optional)
- dracut (optional)
-
- When systemd-hostnamed is used it is strongly recommended to
-diff --git a/configure.ac b/configure.ac
-index 59892cb..70f3e96 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -519,20 +519,17 @@ SYSTEM_SYSVINIT_PATH=/etc/init.d
- SYSTEM_SYSVRCND_PATH=/etc/rc.d
-
- M4_DEFINES=
--have_plymouth=no
-
- case $with_distro in
- fedora)
- SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
- AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL])
- M4_DEFINES=-DTARGET_FEDORA=1
-- have_plymouth=yes
- ;;
- opensuse|suse)
- SYSTEM_SYSVRCND_PATH=/etc/init.d
- AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE])
- M4_DEFINES=-DTARGET_SUSE=1
-- have_plymouth=yes
- ;;
- debian)
- SYSTEM_SYSVRCND_PATH=/etc
-@@ -565,19 +562,16 @@ case $with_distro in
- SYSTEM_SYSVINIT_PATH=/etc/rc.d
- AC_DEFINE(TARGET_FRUGALWARE, [], [Target is Frugalware])
- M4_DEFINES=-DTARGET_FRUGALWARE=1
-- have_plymouth=yes
- ;;
- altlinux)
- SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
- AC_DEFINE(TARGET_ALTLINUX, [], [Target is ALTLinux])
- M4_DEFINES=-DTARGET_ALTLINUX=1
-- have_plymouth=yes
- ;;
- mandriva)
- SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
- AC_DEFINE(TARGET_MANDRIVA, [], [Target is Mandriva])
- M4_DEFINES=-DTARGET_MANDRIVA=1
-- have_plymouth=yes
- ;;
- meego)
- SYSTEM_SYSVINIT_PATH=
-@@ -594,7 +588,6 @@ case $with_distro in
- SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
- AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia])
- M4_DISTRO_FLAG=-DTARGET_MAGEIA=1
-- have_plymouth=yes
- ;;
- other)
- ;;
-@@ -635,11 +628,6 @@ AC_ARG_WITH([tty-gid],
- [AC_DEFINE_UNQUOTED(TTY_GID, [$withval], [GID of the 'tty' group])],
- [])
-
--AC_ARG_ENABLE(plymouth, AS_HELP_STRING([--enable-plymouth], [enable plymouth support]))
--if test -n "$enable_plymouth"; then
-- have_plymouth="$enable_plymouth"
--fi
--
- AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
- AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
- AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
-@@ -655,7 +643,6 @@ AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego)
- AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom)
- AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia)
-
--AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes")
- AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes")
-
- AC_ARG_WITH([dbuspolicydir],
-@@ -747,7 +734,6 @@ AC_MSG_RESULT([
- timedated: ${have_timedated}
- localed: ${have_localed}
- coredump: ${have_coredump}
-- plymouth: ${have_plymouth}
- firmware path: ${FIRMWARE_PATH}
- usb.ids: ${USB_DATABASE}
- pci.ids: ${PCI_DATABASE}
-diff --git a/units/.gitignore b/units/.gitignore
-index dc5e1d4..eb2516d 100644
---- a/units/.gitignore
-+++ b/units/.gitignore
-@@ -11,7 +11,6 @@ console-shell.service
- systemd-sysctl.service
- systemd-ask-password-console.service
- rescue.service
--systemd-ask-password-plymouth.service
- systemd-ask-password-wall.service
- quotacheck.service
- fsck@.service
-diff --git a/units/plymouth-halt.service b/units/plymouth-halt.service
-deleted file mode 100644
-index 5dca3cc..0000000
---- a/units/plymouth-halt.service
-+++ b/dev/null
-@@ -1,18 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Show Plymouth Halt Screen
--After=getty(a)tty1.service prefdm.service plymouth-start.service
--Before=halt.service
--DefaultDependencies=no
--ConditionKernelCommandLine=!plymouth.enable=0
--
--[Service]
--ExecStart=/sbin/plymouthd --mode=shutdown
--ExecStartPost=-/bin/plymouth --show-splash
--Type=forking
-diff --git a/units/plymouth-kexec.service b/units/plymouth-kexec.service
-deleted file mode 100644
-index 8c36b75..0000000
---- a/units/plymouth-kexec.service
-+++ b/dev/null
-@@ -1,18 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Show Plymouth Reboot with kexec Screen
--After=getty(a)tty1.service prefdm.service plymouth-start.service
--Before=kexec.service
--DefaultDependencies=no
--ConditionKernelCommandLine=!plymouth.enable=0
--
--[Service]
--ExecStart=/sbin/plymouthd --mode=shutdown
--ExecStartPost=-/bin/plymouth --show-splash
--Type=forking
-diff --git a/units/plymouth-poweroff.service b/units/plymouth-poweroff.service
-deleted file mode 100644
-index e69033a..0000000
---- a/units/plymouth-poweroff.service
-+++ b/dev/null
-@@ -1,18 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Show Plymouth Power Off Screen
--After=getty(a)tty1.service prefdm.service plymouth-start.service
--Before=poweroff.service
--DefaultDependencies=no
--ConditionKernelCommandLine=!plymouth.enable=0
--
--[Service]
--ExecStart=/sbin/plymouthd --mode=shutdown
--ExecStartPost=-/bin/plymouth --show-splash
--Type=forking
-diff --git a/units/plymouth-quit-wait.service b/units/plymouth-quit-wait.service
-deleted file mode 100644
-index 3801c88..0000000
---- a/units/plymouth-quit-wait.service
-+++ b/dev/null
-@@ -1,15 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Wait for Plymouth Boot Screen to Quit
--After=rc-local.service plymouth-start.service systemd-user-sessions.service
--
--[Service]
--ExecStart=-/bin/plymouth --wait
--Type=oneshot
--TimeoutSec=20
-diff --git a/units/plymouth-quit.service b/units/plymouth-quit.service
-deleted file mode 100644
-index 8b4860f..0000000
---- a/units/plymouth-quit.service
-+++ b/dev/null
-@@ -1,15 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Terminate Plymouth Boot Screen
--After=rc-local.service plymouth-start.service systemd-user-sessions.service
--
--[Service]
--ExecStart=-/bin/plymouth quit
--Type=oneshot
--TimeoutSec=20
-diff --git a/units/plymouth-read-write.service b/units/plymouth-read-write.service
-deleted file mode 100644
-index e8ef447..0000000
---- a/units/plymouth-read-write.service
-+++ b/dev/null
-@@ -1,16 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Tell Plymouth To Write Out Runtime Data
--DefaultDependencies=no
--After=local-fs.target
--Before=sysinit.target
--
--[Service]
--ExecStart=-/bin/plymouth update-root-fs --read-write
--Type=oneshot
-diff --git a/units/plymouth-reboot.service b/units/plymouth-reboot.service
-deleted file mode 100644
-index 5c52bc6..0000000
---- a/units/plymouth-reboot.service
-+++ b/dev/null
-@@ -1,18 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Show Plymouth Reboot Screen
--After=getty(a)tty1.service prefdm.service plymouth-start.service
--Before=reboot.service
--DefaultDependencies=no
--ConditionKernelCommandLine=!plymouth.enable=0
--
--[Service]
--ExecStart=/sbin/plymouthd --mode=shutdown
--ExecStartPost=-/bin/plymouth --show-splash
--Type=forking
-diff --git a/units/plymouth-start.service b/units/plymouth-start.service
-deleted file mode 100644
-index 2e358aa..0000000
---- a/units/plymouth-start.service
-+++ b/dev/null
-@@ -1,22 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Show Plymouth Boot Screen
--DefaultDependencies=no
--Wants=systemd-ask-password-plymouth.path
--After=systemd-vconsole-setup.service systemd-udev-settle.service
--Before=systemd-ask-password-plymouth.service
--
--# Dracut informs us with this flag file if plymouth is already running
--ConditionPathExists=!/run/plymouth/pid
--ConditionKernelCommandLine=!plymouth.enable=0
--
--[Service]
--ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid
--ExecStartPost=-/bin/plymouth --show-splash
--Type=forking
-diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
-deleted file mode 100644
-index 9320b4a..0000000
---- a/units/systemd-ask-password-plymouth.path
-+++ b/dev/null
-@@ -1,20 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Forward Password Requests to Plymouth Directory Watch
--Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
--DefaultDependencies=no
--Conflicts=shutdown.target
--After=plymouth-start.service
--Before=basic.target shutdown.target
--ConditionKernelCommandLine=!plymouth.enable=0
--ConditionPathExists=/run/plymouth/pid
--
--[Path]
--DirectoryNotEmpty=/run/systemd/ask-password
--MakeDirectory=yes
-diff --git a/units/systemd-ask-password-plymouth.service.in b/units/systemd-ask-password-plymouth.service.in
-deleted file mode 100644
-index ea80bbd..0000000
---- a/units/systemd-ask-password-plymouth.service.in
-+++ b/dev/null
-@@ -1,19 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Forward Password Requests to Plymouth
--Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
--DefaultDependencies=no
--Conflicts=shutdown.target
--After=plymouth-start.service
--Before=shutdown.target
--ConditionKernelCommandLine=!plymouth.enable=0
--ConditionPathExists=/run/plymouth/pid
--
--[Service]
--ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth
---
-cgit v0.9.0.2-2-gbebe
diff --git a/systemd/patches/systemd-185-udev-accept-rd-parameters.patch b/systemd/patches/systemd-185-udev-accept-rd-parameters.patch
deleted file mode 100644
index 84e1bb2..0000000
--- a/systemd/patches/systemd-185-udev-accept-rd-parameters.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From e6f86cac1619d504ea51c08608fa60b8e4359c52 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay(a)vrfy.org>
-Date: Mon, 04 Jun 2012 20:46:32 +0000
-Subject: udev: kernel cmdline - accept rd.* parameters
-
----
-diff --git a/man/systemd-udevd.xml b/man/systemd-udevd.xml
-index 1be356f..79f917e 100644
---- a/man/systemd-udevd.xml
-+++ b/man/systemd-udevd.xml
-@@ -116,20 +116,24 @@
-
- <refsect1><title>Kernel command line</title>
- <variablelist>
-+ <para>The parameters starting with "rd.", will be read when udev is used in an initrd.</para>
- <varlistentry>
- <term><varname>udev.log-priority=</varname></term>
-+ <term><varname>rd.udev.log-priority=</varname></term>
- <listitem>
- <para>Set the logging priority.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><varname>udev.children-max=</varname></term>
-+ <term><varname>rd.udev.children-max=</varname></term>
- <listitem>
- <para>Limit the number of parallel executed events.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><varname>udev.exec-delay=</varname></term>
-+ <term><varname>rd.udev.exec-delay=</varname></term>
- <listitem>
- <para>Number of seconds to delay the execution of RUN instructions.
- This might be useful when debugging system crashes during coldplug
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 2ac9fde..75e7766 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -1013,6 +1013,48 @@ static int systemd_fds(struct udev *udev, int *rctrl, int *rnetlink)
- return 0;
- }
-
-+/*
-+ * read the kernel commandline, in case we need to get into debug mode
-+ * udev.log-priority=<level> syslog priority
-+ * udev.children-max=<number of workers> events are fully serialized if set to 1
-+ * udev.exec-delay=<number of seconds> delay execution of every executed program
-+ */
-+static void kernel_cmdline_options(struct udev *udev)
-+{
-+ char *line, *w, *state;
-+ size_t l;
-+
-+ if (read_one_line_file("/proc/cmdline", &line) < 0)
-+ return;
-+
-+ FOREACH_WORD_QUOTED(w, l, line, state) {
-+ char *s, *opt;
-+
-+ s = strndup(w, l);
-+ if (!s)
-+ break;
-+
-+ /* accept the same options for the initrd, prefixed with "rd." */
-+ if (in_initrd() && startswith(s, "rd."))
-+ opt = s + 3;
-+ else
-+ opt = s;
-+
-+ if (startswith(opt, "udev.log-priority="))
-+ udev_set_log_priority(udev, util_log_priority(opt + 18));
-+
-+ if (startswith(opt, "udev.children-max="))
-+ children_max = strtoul(opt + 18, NULL, 0);
-+
-+ if (startswith(opt, "udev.exec-delay="))
-+ exec_delay = strtoul(opt + 16, NULL, 0);
-+
-+ free(s);
-+ }
-+
-+ free(line);
-+}
-+
- int main(int argc, char *argv[])
- {
- struct udev *udev;
-@@ -1101,39 +1143,7 @@ int main(int argc, char *argv[])
- }
- }
-
-- /*
-- * read the kernel commandline, in case we need to get into debug mode
-- * udev.log-priority=<level> syslog priority
-- * udev.children-max=<number of workers> events are fully serialized if set to 1
-- *
-- */
-- f = fopen("/proc/cmdline", "r");
-- if (f != NULL) {
-- char cmdline[4096];
--
-- if (fgets(cmdline, sizeof(cmdline), f) != NULL) {
-- char *pos;
--
-- pos = strstr(cmdline, "udev.log-priority=");
-- if (pos != NULL) {
-- pos += strlen("udev.log-priority=");
-- udev_set_log_priority(udev, util_log_priority(pos));
-- }
--
-- pos = strstr(cmdline, "udev.children-max=");
-- if (pos != NULL) {
-- pos += strlen("udev.children-max=");
-- children_max = strtoul(pos, NULL, 0);
-- }
--
-- pos = strstr(cmdline, "udev.exec-delay=");
-- if (pos != NULL) {
-- pos += strlen("udev.exec-delay=");
-- exec_delay = strtoul(pos, NULL, 0);
-- }
-- }
-- fclose(f);
-- }
-+ kernel_cmdline_options(udev);
-
- if (getuid() != 0) {
- fprintf(stderr, "root privileges required\n");
---
-cgit v0.9.0.2-2-gbebe
diff --git a/systemd/patches/systemd-185-udev-fix-after-udev-trigger.service.patch b/systemd/patches/systemd-185-udev-fix-after-udev-trigger.service.patch
deleted file mode 100644
index 00acdd9..0000000
--- a/systemd/patches/systemd-185-udev-fix-after-udev-trigger.service.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a2368a3f37ede469d4359421c1e4ad304c682a07 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay(a)vrfy.org>
-Date: Wed, 06 Jun 2012 12:30:16 +0000
-Subject: udev: systemd-udev-settle.service fix After=
-
-https://bugs.freedesktop.org/show_bug.cgi?id=50779
----
-diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in
-index d637700..2c4c129 100644
---- a/units/systemd-udev-settle.service.in
-+++ b/units/systemd-udev-settle.service.in
-@@ -21,7 +21,7 @@ Documentation=man:udev(7)
- Documentation=man:systemd-udevd(8)
- DefaultDependencies=no
- Wants=systemd-udev.service
--After=udev-trigger.service
-+After=systemd-udev-trigger.service
- Before=basic.target
- ConditionCapability=CAP_MKNOD
-
---
-cgit v0.9.0.2-2-gbebe
diff --git a/systemd/patches/systemd-185-udev-remove-remaining-selinux-labeling.patch b/systemd/patches/systemd-185-udev-remove-remaining-selinux-labeling.patch
deleted file mode 100644
index d6fec1c..0000000
--- a/systemd/patches/systemd-185-udev-remove-remaining-selinux-labeling.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3cbd5f6be191a4e71fc85d8b893e96d6d65bf792 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay(a)vrfy.org>
-Date: Tue, 05 Jun 2012 15:31:32 +0000
-Subject: udev: remove remaining selinux labeling for file in /run
-
----
-diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
-index bdb0e70..2347736 100644
---- a/src/libudev/libudev-device-private.c
-+++ b/src/libudev/libudev-device-private.c
-@@ -35,7 +35,7 @@ static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
- if (add) {
- int fd;
-
-- mkdir_parents_label(filename, 0755);
-+ mkdir_parents(filename, 0755);
- fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
- if (fd >= 0)
- close(fd);
-@@ -119,7 +119,7 @@ int udev_device_update_db(struct udev_device *udev_device)
-
- /* write a database file */
- util_strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
-- mkdir_parents_label(filename_tmp, 0755);
-+ mkdir_parents(filename_tmp, 0755);
- f = fopen(filename_tmp, "we");
- if (f == NULL) {
- udev_err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
-diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
-index 2ef6341..aee84a9 100644
---- a/src/udev/udev-node.c
-+++ b/src/udev/udev-node.c
-@@ -226,7 +226,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
- do {
- int fd;
-
-- err = mkdir_parents_label(filename, 0755);
-+ err = mkdir_parents(filename, 0755);
- if (err != 0 && err != -ENOENT)
- break;
- fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 0d0aba9..30e72e1 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
###############################################################################
name = systemd
-version = 185
-release = 3
+version = 186
+release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
groups = System/Base
@@ -281,9 +281,10 @@ packages
end
files
- %{libdir}/libgudev*.so
+ %{libdir}/lib*udev*.so
%{libdir}/pkgconfig/lib*udev.pc
%{libdir}/pkgconfig/gudev*
+ %{includedir}/lib*udev.h
%{includedir}/gudev*
%{datadir}/gir-*
%{datadir}/gtk-doc/html/gudev
hooks/post-receive
--
IPFire 3.x development tree
