dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21a657a1cd
systemd/systemd.spec

3027 lines
118 KiB
RPMSpec
Raw Normal View History

Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
#
Updating link to change in openSUSE:Factory/systemd revision 28 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=86c3d8071be5120a0e8791a5c715dd71
2011-01-14 03:32:33 +01:00
# spec file for package systemd
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
#
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=482
2014-01-14 19:31:08 +01:00
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
- Update to version 43: + requires /etc/os-release, support for /etc/SuSE-release is no longer present. + Track class of PAM logins to distinguish greeters from normal user logins. + Various bug fixes. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=250
2012-02-20 14:58:44 +01:00
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%define bootstrap 0
%define real systemd
%define udevpkgname udev
%define udev_major 1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=511
2014-02-09 19:45:14 +01:00
%bcond_without bash_completion
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%bcond_without compat_libs
%bcond_with networkd
%bcond_with python
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=810
2014-11-03 16:22:08 +01:00
%bcond_with parentpathid
- Do not build EFI support code in architectures on which the kernel does not support CONFIG_EFI, it won't work. (ia64 also supports it, but that's dead so is not included) - Do not build EFI support code in architectures on which the kernel does not support CONFIG_EFI, it won't work. (ia64 also supports it, but that's dead so is not included) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=671
2014-06-12 11:30:28 +02:00
%ifarch %{ix86} x86_64 aarch64
%define has_efi 1
%else
%define has_efi 0
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=732
2014-07-25 13:07:45 +02:00
%if 0%{?suse_version} > 1315
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
%bcond_without permission
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%bcond_without blkrrpart
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=733
2014-07-25 13:38:38 +02:00
%bcond_without udevsettle
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=732
2014-07-25 13:07:45 +02:00
%else
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
%bcond_with permission
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=732
2014-07-25 13:07:45 +02:00
%bcond_with blkrrpart
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=733
2014-07-25 13:38:38 +02:00
%bcond_with udevsettle
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=732
2014-07-25 13:07:45 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=751
2014-08-18 16:41:57 +02:00
%bcond_with systemgrps
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=811
2014-11-07 13:36:25 +01:00
%{expand: %%global has_tmpkeep %(type -p systemd-tmpfiles-keep &>/dev/null && echo 1 || echo 0)}
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
Version: 210
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
Release: 0
Summary: A System and Session Manager
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
License: LGPL-2.1+
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
BuildRequires: acl
Updating link to change in openSUSE:Factory/systemd revision 4 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=4e7378d076434ce21b4f72e608c7c999
2010-08-13 02:39:56 +02:00
BuildRequires: audit-devel
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%if %{with compat_libs}
- Don't require non-existing binutils-gold OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=559
2014-03-14 12:02:35 +01:00
# See gold_archs in binutils.spec
%ifarch %ix86 %arm x86_64 ppc ppc64 ppc64le %sparc
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
BuildRequires: binutils-gold
%endif
- Don't require non-existing binutils-gold OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=559
2014-03-14 12:02:35 +01:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=597
2014-04-16 12:17:08 +02:00
BuildRequires: config(suse-module-tools)
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if ! 0%{?bootstrap}
- Update to version 42: + Various bug fixes + Watchdog support for supervising services is now usable + Service start rate limiting is now configurable and can be turned off per service. + New CanReboot(), CanPowerOff() bus calls in systemd-logind - Dropped fix-kmod-build.patch, fix-message-after-chkconfig.patch, is-enabled-non-existing-service.patch (merged upstream) - Add libxslt1 / docbook-xsl-stylesheets as BuildRequires for manpage generation OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=245
2012-02-13 14:17:26 +01:00
BuildRequires: docbook-xsl-stylesheets
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
- Update to version 39: + New systemd-cgtop tool to show control groups by their resource usage. + Linking against libacl for ACLs is optional again. + If a group "adm" exists, journal files are automatically owned by them, thus allow members of this group full access to the system journal as well as all user journals. + The journal now stores the SELinux context of the logging client for all entries. + Add C++ inclusion guards to all public headers. + New output mode "cat" in the journal to print only text messages, without any meta data like date or time. + Include tiny X server wrapper as a temporary stop-gap to teach XOrg udev display enumeration (until XOrg supports udev hotplugging for display devices). + Add new systemd-cat tool for executing arbitrary programs with STDERR/STDOUT connected to the journal. Can also act as BSD logger replacement, and does so by default. + Optionally store all locally generated coredumps in the journal along with meta data. + systemd-tmpfiles learnt four new commands: n, L, c, b, for writing short strings to files (for usage for /sys), and for creating symlinks, character and block device nodes. + New unit file option ControlGroupPersistent= to make cgroups persistent. + Support multiple local RTCs in a sane way. + No longer monopolize IO when replaying readahead data on rotating disks. + Don't show kernel threads in systemd-cgls anymore, unless requested with new -k switch. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=234
2012-01-25 15:08:16 +01:00
BuildRequires: fdupes
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if ! 0%{?bootstrap}
BuildRequires: gobject-introspection-devel
%endif
Update to v33 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=170
2011-08-03 17:57:56 +02:00
BuildRequires: gperf
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if ! 0%{?bootstrap}
BuildRequires: gtk-doc
%endif
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
BuildRequires: intltool
- Update to version 34: * Bugfixes * optionaly apply cgroup attributes to cgroups systemd creates * honour sticky bit when trimming cgroup trees * improve readahead - Add libacl-devel as BuildRequires (needed for systemd-uaccess) - Add some %{nil} to systemd.macros to fix some build issues. - Fix dbus assertion - move gtk part to its own package, to reduce bootstrapping (bnc#713981). old: Base:System/systemd new: home:fcrozat:systemd/systemd rev NoneIndex: macros.systemd =================================================================== --- macros.systemd (revision 186) +++ macros.systemd (revision 29) @@ -39,7 +39,8 @@ if [ $FIRST_ARG -eq 1 ]; then \ # Initial installation \ /bin/systemctl daemon-reload >/dev/null 2>&1 || : \ -fi +fi \ +%{nil} # On uninstall, disable and stop services %service_del_preun() \ @@ -48,7 +49,8 @@ # Package removal, not upgrade \ /bin/systemctl --no-reload disable %{?*} > /dev/null 2>&1 || : \ /bin/systemctl stop %{?*} > /dev/null 2>&1 || : \ -fi +fi \ +%{nil} # On uninstall, tell systemd to reload its unit files %service_del_postun() \ @@ -57,7 +59,8 @@ if [ $FIRST_ARG -ge 1 ]; then \ # Package upgrade, not uninstall \ /bin/systemctl try-restart %{?*} >/dev/null 2>&1 || : \ -fi +fi \ +%{nil} %service_migrate_to_systemd_pre() \ test -n "$FIRST_ARG" || FIRST_ARG=$1 \ @@ -75,7 +78,8 @@ if [ -n "$services_to_migrate" ]; then \ /usr/sbin/systemd-sysv-convert --save $services_to_migrate >/dev/null 2>&1 || : \ fi \ -fi +fi \ +%{nil} %service_migrate_to_systemd_post() \ for service in %{?*} ; do \ @@ -88,6 +92,7 @@ /usr/sbin/systemd-sysv-convert --apply $services_to_migrate >/dev/null 2>&1 || : \ /bin/systemctl daemon-reload >/dev/null 2>&1 || : \ fi \ +%{nil} %service_migrate_to_systemd_postun() \ test -n "$FIRST_ARG" || FIRST_ARG=$1 \ @@ -95,5 +100,6 @@ for service in %{?*} ; do \ rm -f "/var/lib/systemd/migrated/$service" 2> /dev/null \ done \ -fi +fi \ +%{nil} Index: systemd.changes =================================================================== --- systemd.changes (revision 186) +++ systemd.changes (revision 29) @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Thu Sep 1 09:25:40 UTC 2011 - fcrozat@novell.com + +- Update to version 34: + * Bugfixes + * optionaly apply cgroup attributes to cgroups systemd creates + * honour sticky bit when trimming cgroup trees + * improve readahead +- Add libacl-devel as BuildRequires (needed for systemd-uaccess) +- Add some %{nil} to systemd.macros to fix some build issues. +- Fix dbus assertion +- move gtk part to its own package, to reduce bootstrapping + (bnc#713981). + +------------------------------------------------------------------- Fri Aug 26 14:10:30 UTC 2011 - fcrozat@suse.com - Update compose_table patch to use two separate loadkeys call, Index: systemd.spec =================================================================== --- systemd.spec (revision 186) +++ systemd.spec (revision 29) @@ -21,8 +21,8 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 33 -Release: 17 +Version: 34 +Release: 1 License: GPLv2+ Group: System/Base Summary: A System and Session Manager @@ -32,11 +32,11 @@ BuildRequires: audit-devel BuildRequires: gperf BuildRequires: libcap-devel +BuildRequires: libacl-devel BuildRequires: tcpd-devel BuildRequires: pam-devel BuildRequires: libcryptsetup-devel BuildRequires: pkg-config -BuildRequires: gtk2-devel libnotify-devel libxslt-devel BuildRequires: libselinux-devel libsepol-devel BuildRequires: intltool Requires: udev >= 172 @@ -62,18 +62,7 @@ # Never add any patches to this package without the upstream commit id # in the patch. Any patches added here without a very good reason to make # an exception will be silently removed with the next version update. -# PATCH-FIX-UPSTREAM aj@suse.de gperf: Include missing.h -Patch2: gperf-missing.patch -# PATCH-FIX-UPSTREAM fcrozat@suse.com -- accept none option in crypttab -Patch3: systemd-cryptsetup.patch -# PATCH-FIX-UPSTREAM fcrozat@suse.com -- don't set getty before passphrase is typed -Patch4: systemd-cryptsetup-query.patch -# PATCH-FIX-UPSTREAM aj@suse.com -- fix crash on systemctl enable -Patch5: fix-crash.patch -# PATCH-FIX-UPSTREAM fcrozat@suse.com bnc671673 -- fix kexec support -Patch7: 0001-initctl-check-for-kexec_loaded-when-reboot-is-reques.patch -# PATCH-FIX-UPSTREAM fcrozat@suse.com -- don't look for system manager configuration when running user manager -Patch9: 0001-path-lookup-monitor-etc-systemd-user-for-user-manage.patch +Patch9: 0001-execute-fix-bus-serialization-for-commands.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -95,15 +84,6 @@ %description devel Development headers and auxiliary files for developing applications for systemd. -%package gtk -License: GPLv2+ -Group: System/Base -Summary: Graphical front-end for systemd -Requires: %{name} = %{version} - -%description gtk -Graphical front-end for systemd system and service manager. - %package sysvinit License: GPLv2+ Group: System/Base @@ -134,12 +114,7 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -153,6 +128,7 @@ --with-distro=suse \ --docdir=%{_docdir}/systemd \ --with-rootdir= \ + --disable-gtk \ CFLAGS="%{optflags}" make %{?_smp_mflags} @@ -185,6 +161,7 @@ ln -s /dev/null %{buildroot}/lib/systemd/system/clock.service ln -s /dev/null %{buildroot}/lib/systemd/system/crypto.service ln -s /dev/null %{buildroot}/lib/systemd/system/crypto-early.service +ln -s /dev/null %{buildroot}/lib/systemd/system/device-mapper.service ln -s /dev/null %{buildroot}/lib/systemd/system/earlysyslog.service ln -s /dev/null %{buildroot}/lib/systemd/system/kbd.service ln -s /dev/null %{buildroot}/lib/systemd/system/ldconfig.service @@ -334,11 +311,6 @@ %dir /var/lib/systemd/sysv-convert %dir /var/lib/systemd/migrated -%files gtk -%defattr(-,root,root,-) -%{_bindir}/systemadm -%{_bindir}/systemd-gnome-ask-password-agent -%{_mandir}/man1/systemadm.1* %files devel %defattr(-,root,root,-) Index: 0001-execute-fix-bus-serialization-for-commands.patch =================================================================== --- 0001-execute-fix-bus-serialization-for-commands.patch (added) +++ 0001-execute-fix-bus-serialization-for-commands.patch (revision 29) @@ -0,0 +1,44 @@ +From 7daa9e6e29b546275566084512ea4e547bc79b91 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Mon, 29 Aug 2011 19:44:52 +0200 +Subject: [PATCH] execute: fix bus serialization for commands + +--- + src/dbus-execute.c | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/dbus-execute.c b/src/dbus-execute.c +index 6ceffc5..201f6b5 100644 +--- a/src/dbus-execute.c ++++ b/src/dbus-execute.c +@@ -308,13 +308,14 @@ int bus_execute_append_command(DBusMessageIter *i, const char *property, void *d + assert(i); + assert(property); + +- if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sasbttuii)", &sub)) ++ if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sasbttttuii)", &sub)) + return -ENOMEM; + + LIST_FOREACH(command, c, c) { + char **l; + uint32_t pid; + int32_t code, status; ++ dbus_bool_t b; + + if (!c->path) + continue; +@@ -332,8 +333,10 @@ int bus_execute_append_command(DBusMessageIter *i, const char *property, void *d + code = (int32_t) c->exec_status.code; + status = (int32_t) c->exec_status.status; + ++ b = !!c->ignore; ++ + if (!dbus_message_iter_close_container(&sub2, &sub3) || +- !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_BOOLEAN, &c->ignore) || ++ !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_BOOLEAN, &b) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.start_timestamp.realtime) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.start_timestamp.monotonic) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.exit_timestamp.realtime) || +-- +1.7.3.4 + Index: pre_checkin.sh =================================================================== --- pre_checkin.sh (added) +++ pre_checkin.sh (revision 29) @@ -0,0 +1,6 @@ +#!/bin/sh + +VERSION=`sed -e '/^Version:/!d' -e 's/Version: *//' systemd.spec` +RELEASE=`sed -e '/^Release:/!d' -e 's/Release: *//' systemd.spec` +sed -i -e "s,^\(Version:[ tab]*\).*,\1$VERSION," -e "s,^\(Release:[ tab]*\).*,\1$RELEASE," systemd-gtk.spec +cp systemd.changes systemd-gtk.changes Index: systemd-34.tar.bz2 =================================================================== Binary files systemd-34.tar.bz2 (revision 29) added Index: systemd-gtk.changes =================================================================== --- systemd-gtk.changes (added) +++ systemd-gtk.changes (revision 29) @@ -0,0 +1,1640 @@ +------------------------------------------------------------------- +Thu Sep 1 09:25:40 UTC 2011 - fcrozat@novell.com + +- Update to version 34: + * Bugfixes + * optionaly apply cgroup attributes to cgroups systemd creates + * honour sticky bit when trimming cgroup trees + * improve readahead +- Add libacl-devel as BuildRequires (needed for systemd-uaccess) +- Add some %{nil} to systemd.macros to fix some build issues. +- Fix dbus assertion +- move gtk part to its own package, to reduce bootstrapping + (bnc#713981). + +------------------------------------------------------------------- +Fri Aug 26 14:10:30 UTC 2011 - fcrozat@suse.com + +- Update compose_table patch to use two separate loadkeys call, + compose table overflows otherwise (spotted by Werner Fink). + +------------------------------------------------------------------- +Wed Aug 24 13:02:12 UTC 2011 - fcrozat@novell.com + +- Add tty1.patch: ensure passphrase are handled before starting + gettty on tty1. +- Add inittab generator, creating default.target at startup based + on /etc/inittab value. +- No longer try to create /etc/systemd/system/default.target at + initial package install (bnc#707418) +- Fix configuration path used for systemd user manager. +- Ensure pam-config output is no display in install script. +- Remove buildrequires on vala, no longer needed. + +------------------------------------------------------------------- +Fri Aug 19 15:29:49 UTC 2011 - fcrozat@suse.com + +- Handle disable_capslock, compose table and kbd_rate +- Add rpm macros.systemd file. +- Do not disable klogd, it has its own service now. +- Handle kexec correctly (bnc#671673). +- Disable preload services, they are conflicting with systemd. + +------------------------------------------------------------------- +Fri Aug 19 08:15:15 UTC 2011 - fcrozat@suse.com + +- enable pam_systemd module, using pam-config. + +------------------------------------------------------------------- +Thu Aug 18 07:31:12 UTC 2011 - aj@suse.de + +- Fix crash with systemctl enable. + +------------------------------------------------------------------- +Tue Aug 16 17:02:27 UTC 2011 - fcrozat@suse.com + +- Fix localfs.service to no cause cycle and starts it after + local-fs.target. + +------------------------------------------------------------------- +Thu Aug 4 15:59:58 UTC 2011 - fcrozat@suse.com + +- Remove root-fsck.patch, mkinitrd will use the same path as + dracut. +- Add systemd-cryptsetup.patch: don't complain on "none" option in + crypttab. +- Add systemd-cryptsetup-query.patch: block boot until passphrase + is typed. + +------------------------------------------------------------------- +Wed Aug 3 16:03:25 UTC 2011 - fcrozat@suse.com + +- Add root-fsck.patch: do not run fsck on / if it is rw +- Ship a non null localfs.service, fixes static mount points not + being mounted properly. + +------------------------------------------------------------------- +Wed Aug 3 07:11:33 UTC 2011 - aj@suse.de + +- Update to version 33: + * optimizations and bugfixes. + * New PrivateNetwork= service setting which allows you to shut off + networking for a specific service (i.e. all routable network + interfaces will disappear for that service). + * Merged insserv-parsing.patch and bash-completion-restart.patch + patches. + +------------------------------------------------------------------- +Tue Aug 2 08:29:30 UTC 2011 - fcrozat@suse.com + +- Add insserv-parsing.patch: read/parse insserv.conf. +- Add bash-completion-restart.patch: fix restart service list + (bnc#704782). + +------------------------------------------------------------------- +Mon Aug 1 09:04:53 UTC 2011 - aj@suse.de + +- Split up devel package. +- restart logind after upgrade. +- Adjust rpmlintrc for changes. + +------------------------------------------------------------------- +Fri Jul 29 10:48:20 UTC 2011 - aj@suse.de + +- Update to version 32: + * bugfixes + * improve selinux setup + +------------------------------------------------------------------- +Thu Jul 28 07:27:32 UTC 2011 - aj@suse.de + +- Update to version 31: + * rewrite of enable/disable code: New features systemctl --runtime, + systemctl mask, systemctl link and presets. + * sd-daemon is now shared library. + +------------------------------------------------------------------- +Tue Jul 19 11:56:43 UTC 2011 - aj@suse.de + +- Update to version 30: + + Logic from pam_systemd has been moved to new systemd-login. + + VT gettys are autospawn only when needed + + Handle boot.local/halt.local on SUSE distribution + + add support for systemctl --root + +------------------------------------------------------------------- +Wed Jun 29 12:54:24 UTC 2011 - fcrozat@suse.com + +- Make sure to not start kbd initscript, it is handled by systemd + natively. + +------------------------------------------------------------------- +Fri Jun 17 09:34:24 UTC 2011 - fcrozat@novell.com + +- version 29: + + enable chkconfig support in systemctl for openSUSE. + + systemctl: plug a leak upon create_symlink mismatch + + mount /run without MS_NOEXEC + + dbus: fix name of capability property + + systemctl: fix double unref of a dbus message + + cryptsetup-generator: fix /etc/cryptsetup options + + selinux: selinuxfs can be mounted on /sys/fs/selinux + + readahead-common: fix total memory size detection + + systemctl: fix 'is-enabled' for native units under /lib + + systemctl: fix a FILE* leak + + pam-module: add debug= parameter + + remote-fs.target: do not order after network.target +- update tarball url. + +------------------------------------------------------------------- +Wed Jun 15 10:00:29 UTC 2011 - saschpe@suse.de + +- Use RPM macros instead of $RPM_FOO variables +- Don't require %{version}-%{release} of the base package, + %{version} is sufficient + +------------------------------------------------------------------- +Tue Jun 14 15:10:41 CEST 2011 - kay.sievers@novell.com + +- new snapshot + - mount /run without MS_NOEXEC + - readahead-common: fix total memory size detection + - enable chkconfig support in systemctl for openSUSE + - selinux: selinuxfs can be mounted on /sys/fs/selinux + - cryptsetup-generator: fix /etc/cryptsetup options + - systemctl: fix double unref of a dbus message +- drop merged chkconfig patch + +------------------------------------------------------------------- +Tue Jun 14 12:39:25 UTC 2011 - fcrozat@novell.com + +- Add sysv chkconfig patch to be able to enable / disable sysv + initscripts with systemctl. +- Ensure plymouth support is buildable conditionnally. + +------------------------------------------------------------------- +Thu May 26 21:16:06 CEST 2011 - kay.sievers@novell.com + +- version 28 + - drop hwclock-save.service + - fix segfault when a DBus message has no interface + - man: update the list of unit search locations + - readahead-collect: ignore EACCES for fanotify + - rtc in localtime: use settimeofday(NULL, tz) + instead of hwclock(8) + +------------------------------------------------------------------- +Sat May 21 23:57:30 CEST 2011 - kay.sievers@novell.com + +- new snapshot + - fix crash in D-Bus code + +------------------------------------------------------------------- +Sat May 21 18:17:59 CEST 2011 - kay.sievers@novell.com + +- new snapshot + - socket: always use SO_{RCV,SND}BUFFORCE to allow larger values + - util: use new VT ESC sequence to clear scrollback buffer + - sd-daemon: move _sd_hidden_ from .h to .c file + - missing: add IP_TRANSPARENT (1441 more lines skipped) Index: systemd-gtk.spec =================================================================== --- systemd-gtk.spec (added) +++ systemd-gtk.spec (revision 29) @@ -0,0 +1,83 @@ +# +# spec file for package systemd-gtk +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: systemd-gtk +Url: http://www.freedesktop.org/wiki/Software/systemd +Version: 34 +Release: 1 +License: GPLv2+ +Group: System/Base +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: libudev-devel udev +BuildRequires: dbus-1-devel +BuildRequires: audit-devel +BuildRequires: gperf +BuildRequires: libcap-devel +BuildRequires: libacl-devel +BuildRequires: tcpd-devel +BuildRequires: pam-devel +BuildRequires: libcryptsetup-devel +BuildRequires: pkg-config +BuildRequires: libselinux-devel libsepol-devel +BuildRequires: intltool +BuildRequires: gtk2-devel libnotify-devel +Summary: Graphical front-end for systemd +Requires: systemd = %{version} +Source0: http://www.freedesktop.org/software/systemd/systemd-%{version}.tar.bz2 +Source1: systemd-rpmlintrc + +# Upstream First - Policy: +# Never add any patches to this package without the upstream commit id +# in the patch. Any patches added here without a very good reason to make +# an exception will be silently removed with the next version update. + +%description +Graphical front-end for systemd system and service manager. + +%prep +%setup -q -n systemd-%{version} + +%build +autoreconf -fiv +# prevent pre-generated and distributed files from re-building +find . -name "*.[1-8]" -exec touch '{}' \; +touch src/systemadm.c +export V=1 +%configure \ + --with-distro=suse \ + --docdir=%{_docdir}/systemd \ + --with-rootdir= \ + CFLAGS="%{optflags}" +make %{?_smp_mflags} + +%install +%makeinstall +# remove everything but systemadm and password agent +find %{buildroot} -not -type d -not -name 'systemadm*' -not -name systemd-gnome-ask-password-agent -delete + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%{_bindir}/systemadm +%{_bindir}/systemd-gnome-ask-password-agent +%{_mandir}/man1/systemadm.1* + +%changelog Index: 0001-initctl-check-for-kexec_loaded-when-reboot-is-reques.patch =================================================================== --- 0001-initctl-check-for-kexec_loaded-when-reboot-is-reques.patch (revision 186) +++ 0001-initctl-check-for-kexec_loaded-when-reboot-is-reques.patch (deleted) @@ -1,82 +0,0 @@ -From b1e304bb59e1a80abacfd6f0377ae14c3c1a10cc Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Mon, 22 Aug 2011 14:58:50 +0200 -Subject: [PATCH] initctl: check for kexec_loaded when reboot is requested through initctl - ---- - src/initctl.c | 2 ++ - src/systemctl.c | 12 ------------ - src/util.c | 12 ++++++++++++ - src/util.h | 2 ++ - 4 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/src/initctl.c b/src/initctl.c -index f36f1cc..eaa717a 100644 ---- a/src/initctl.c -+++ b/src/initctl.c -@@ -93,6 +93,8 @@ static const char *translate_runlevel(int runlevel, bool *isolate) { - for (i = 0; i < ELEMENTSOF(table); i++) - if (table[i].runlevel == runlevel) { - *isolate = table[i].isolate; -+ if (runlevel == '6' && kexec_loaded()) -+ return SPECIAL_KEXEC_TARGET; - return table[i].special; - } - -diff --git a/src/systemctl.c b/src/systemctl.c -index bb998d3..0ff9221 100644 ---- a/src/systemctl.c -+++ b/src/systemctl.c -@@ -4403,18 +4403,6 @@ static int parse_time_spec(const char *t, usec_t *_u) { - return 0; - } - --static bool kexec_loaded(void) { -- bool loaded = false; -- char *s; -- -- if (read_one_line_file("/sys/kernel/kexec_loaded", &s) >= 0) { -- if (s[0] == '1') -- loaded = true; -- free(s); -- } -- return loaded; --} -- - static int shutdown_parse_argv(int argc, char *argv[]) { - - enum { -diff --git a/src/util.c b/src/util.c -index 8d54049..247156d 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -5680,3 +5680,15 @@ static const char *const signal_table[] = { - }; - - DEFINE_STRING_TABLE_LOOKUP(signal, int); -+ -+bool kexec_loaded(void) { -+ bool loaded = false; -+ char *s; -+ -+ if (read_one_line_file("/sys/kernel/kexec_loaded", &s) >= 0) { -+ if (s[0] == '1') -+ loaded = true; -+ free(s); -+ } -+ return loaded; -+} -diff --git a/src/util.h b/src/util.h -index 407160d..8b31e5b 100644 ---- a/src/util.h -+++ b/src/util.h -@@ -497,4 +497,6 @@ int signal_from_string_try_harder(const char *s); - extern int saved_argc; - extern char **saved_argv; - -+bool kexec_loaded(void); -+ - #endif --- -1.7.3.4 - Index: 0001-path-lookup-monitor-etc-systemd-user-for-user-manage.patch =================================================================== --- 0001-path-lookup-monitor-etc-systemd-user-for-user-manage.patch (revision 186) +++ 0001-path-lookup-monitor-etc-systemd-user-for-user-manage.patch (deleted) @@ -1,25 +0,0 @@ -From 1cf32c016f97b2c99d7df06ce5d5b858f86c507a Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Wed, 24 Aug 2011 13:39:06 +0200 -Subject: [PATCH] path-lookup: monitor /etc/systemd/user for user manager - ---- - src/path-lookup.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/path-lookup.c b/src/path-lookup.c -index bed9175..5f5ad8c 100644 ---- a/src/path-lookup.c -+++ b/src/path-lookup.c -@@ -209,7 +209,7 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as, bool personal - * the arrays in user_dirs() above! */ - "/run/systemd/user", - USER_CONFIG_UNIT_PATH, -- "/etc/systemd/system", -+ "/etc/systemd/user", - "/usr/local/lib/systemd/user", - "/usr/local/share/systemd/user", - USER_DATA_UNIT_PATH, --- -1.7.3.4 - Index: fix-crash.patch =================================================================== --- fix-crash.patch (revision 186) +++ fix-crash.patch (deleted) @@ -1,19 +0,0 @@ -commit e191553d1dc80cd6d65d05f0cb29f8967fab6983 -Author: Kay Sievers <kay.sievers@vrfy.org> -Date: Wed Aug 17 19:38:07 2011 +0200 - - convert int to boolean for dbus_bool_t - -diff --git a/src/dbus-manager.c b/src/dbus-manager.c -index ae88895..cfc2afc 100644 ---- a/src/dbus-manager.c -+++ b/src/dbus-manager.c -@@ -444,7 +444,7 @@ static DBusMessage *message_from_file_changes( - if (carries_install_info >= 0) { - dbus_bool_t b; - -- b = carries_install_info; -+ b = !!carries_install_info; - if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &b)) - goto oom; - } Index: gperf-missing.patch =================================================================== --- gperf-missing.patch (revision 186) +++ gperf-missing.patch (deleted) @@ -1,25 +0,0 @@ -From: Thierry Reding <thierry.reding@avionic-design.de> -To: systemd-devel@lists.freedesktop.org -Date: Wed, 3 Aug 2011 08:40:27 +0200 -Subject: [systemd-devel] [PATCH] gperf: Include missing.h. - -Older GNU C libraries don't define RLIMIT_RTTIME, so including the -missing.h is required to fix the build. ---- - src/load-fragment-gperf.gperf.m4 | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/load-fragment-gperf.gperf.m4 b/src/load-fragment-gperf.gperf.m4 -index 650f444..8e52890 100644 ---- a/src/load-fragment-gperf.gperf.m4 -+++ b/src/load-fragment-gperf.gperf.m4 -@@ -2,6 +2,7 @@ - #include <stddef.h> - #include "conf-parser.h" - #include "load-fragment.h" -+#include "missing.h" - %} - struct ConfigPerfItem; - %null_strings --- -1.7.6 Index: systemd-33.tar.bz2 =================================================================== Binary files systemd-33.tar.bz2 (revision 186) deleted Index: systemd-cryptsetup-query.patch =================================================================== --- systemd-cryptsetup-query.patch (revision 186) +++ systemd-cryptsetup-query.patch (deleted) @@ -1,28 +0,0 @@ -From d58446e4b3217f97baca7961154813a563ccdd19 Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Thu, 4 Aug 2011 16:46:33 +0200 -Subject: [PATCH] cryptsetup-generator: block boot when querying passphrase. - -Ensure we wait for passphrase before starting tty1 or graphical display. -Needed when not using plymouth. ---- - src/cryptsetup-generator.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c -index a340218..6f3aa78 100644 ---- a/src/cryptsetup-generator.c -+++ b/src/cryptsetup-generator.c -@@ -112,7 +112,8 @@ static int create_disk( - "DefaultDependencies=no\n" - "BindTo=%s dev-mapper-%%i.device\n" - "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n" -- "Before=umount.target\n", -+ "Before=umount.target\n" -+ "Before=local-fs.target\n", - d, d); - - if (!nofail) --- -1.7.3.4 - Index: systemd-cryptsetup.patch =================================================================== --- systemd-cryptsetup.patch (revision 186) +++ systemd-cryptsetup.patch (deleted) @@ -1,25 +0,0 @@ -From aa5f34f2109a02db7887c220c5a35b6a8ee3e6c8 Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Thu, 4 Aug 2011 16:04:43 +0200 -Subject: [PATCH] cryptsetup: accept "none" option - ---- - src/cryptsetup.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/cryptsetup.c b/src/cryptsetup.c -index cf288de..ac7b6d6 100644 ---- a/src/cryptsetup.c -+++ b/src/cryptsetup.c -@@ -110,7 +110,7 @@ static int parse_one_option(const char *option) { - return 0; - } - -- } else -+ } else if (!streq(option, "none")) - log_error("Encountered unknown /etc/crypttab option '%s', ignoring.", option); - - return 0; --- -1.7.3.4 - OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=187
2011-09-01 13:43:46 +02:00
BuildRequires: libacl-devel
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
BuildRequires: libcap-devel
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
BuildRequires: libkmod-devel
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
BuildRequires: libsepol-devel
- add libtool as buildrequire to avoid implicit dependency OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=225
2011-11-21 10:32:49 +01:00
BuildRequires: libtool
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if ! 0%{?bootstrap}
- avoid bootstrap cycle with libusb and systemd-mini OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=510
2014-02-09 14:01:19 +01:00
BuildRequires: libusb-devel
- Add fix-dir-noatime-tmpfiles.patch: do not modify directory atime, which was preventing removing empty directories (bnc#751253, rh#810257). - Add improve-restart-behaviour.patch: prevent deadlock during try-restart (bnc#743218). - Add journal-bugfixes.patch: don't crash when rotating journal (bnc#768953) and prevent memleak at rotation time too. - Add ulimit-support.patch: add support for system wide ulimit (bnc#744818). - Add change-terminal.patch: use vt102 instead of vt100 as terminal for non-vc tty. - Package various .wants directories, which were no longer packaged due to plymouth units being removed from systemd package. - Fix buildrequires for manpages build. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=284
2012-07-03 18:31:03 +02:00
BuildRequires: libxslt-tools
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
BuildRequires: pam-devel
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=508
2014-02-07 14:20:42 +01:00
%if 0%{?suse_version} > 1310
BuildRequires: systemd-rpm-macros
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
%if 0%{?suse_version} <= 1315
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
BuildRequires: tcpd-devel
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=656
2014-06-03 18:28:48 +02:00
%endif
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
BuildRequires: xz
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
BuildRequires: pkgconfig(blkid) >= 2.20
%if ! 0%{?bootstrap}
- Fixed disabling CapsLock and enabling NumLock (bnc#746595, 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch, systemd-numlock-suse.patch). - Explicitly require libgcrypt-devel to fix build failure. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=360
2013-04-03 09:18:50 +02:00
BuildRequires: libgcrypt-devel
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%if %{with python}
BuildRequires: python
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
BuildRequires: pkgconfig(glib-2.0) >= 2.22.0
- version 206 , highlights: * Unit files now understand the new %v specifier which resolves to the kernel version string as returned by "uname-r". * "journalctl -b" may now be used to look for boot output of a specific boot. Try "journalctl -b -1" * Creation of "dead" device nodes has been moved from udev into kmod and tmpfiles. * The udev "keymap" data files and tools to apply keyboard specific mappings of scan to key codes, and force-release scan code lists have been entirely replaced by a udev "keyboard" builtin and a hwdb data file. - remove patches now in upstream - systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 - systemd now require the kmod tool in addition to the library. - version 206 , highlights: * Unit files now understand the new %v specifier which resolves to the kernel version string as returned by "uname-r". * "journalctl -b" may now be used to look for boot output of a specific boot. Try "journalctl -b -1" * Creation of "dead" device nodes has been moved from udev into kmod and tmpfiles. * The udev "keymap" data files and tools to apply keyboard specific mappings of scan to key codes, and force-release scan code lists have been entirely replaced by a udev "keyboard" builtin and a hwdb data file. - remove patches now in upstream - systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 - systemd now require the kmod tool in addition to the library. (forwarded request 184035 from elvigia) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=416
2013-07-23 11:21:21 +02:00
BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%if 0%{?suse_version} <= 1310
- version 206 , highlights: * Unit files now understand the new %v specifier which resolves to the kernel version string as returned by "uname-r". * "journalctl -b" may now be used to look for boot output of a specific boot. Try "journalctl -b -1" * Creation of "dead" device nodes has been moved from udev into kmod and tmpfiles. * The udev "keymap" data files and tools to apply keyboard specific mappings of scan to key codes, and force-release scan code lists have been entirely replaced by a udev "keyboard" builtin and a hwdb data file. - remove patches now in upstream - systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 - systemd now require the kmod tool in addition to the library. - version 206 , highlights: * Unit files now understand the new %v specifier which resolves to the kernel version string as returned by "uname-r". * "journalctl -b" may now be used to look for boot output of a specific boot. Try "journalctl -b -1" * Creation of "dead" device nodes has been moved from udev into kmod and tmpfiles. * The udev "keymap" data files and tools to apply keyboard specific mappings of scan to key codes, and force-release scan code lists have been entirely replaced by a udev "keyboard" builtin and a hwdb data file. - remove patches now in upstream - systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 - systemd now require the kmod tool in addition to the library. (forwarded request 184035 from elvigia) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=416
2013-07-23 11:21:21 +02:00
BuildRequires: pkgconfig(libkmod) >= 14
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%else
BuildRequires: pkgconfig(libkmod) >= 15
%endif
- Use pkgconfig symbols for BuildRequires and specify version - Add missing kmod BuildRequires for systemd-gtk OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=249
2012-02-20 11:55:29 +01:00
BuildRequires: pkgconfig(liblzma)
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if ! 0%{?bootstrap}
BuildRequires: pkgconfig(libmicrohttpd)
%endif
BuildRequires: pkgconfig(libpci) >= 3
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=471
2013-12-06 15:15:24 +01:00
BuildRequires: pkgconfig(libpcre)
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if ! 0%{?bootstrap}
BuildRequires: pkgconfig(libqrencode)
- avoid bootstrap cycle with libusb and systemd-mini OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=510
2014-02-09 14:01:19 +01:00
BuildRequires: pkgconfig(usbutils) >= 0.82
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=711
2014-07-11 14:26:50 +02:00
%if 0%{?suse_version} >= 1315
%ifarch %ix86 x86_64 x32 %arm ppc64le s390x
BuildRequires: pkgconfig(libseccomp)
%endif
%else
- Correct the libseccomp distribution version test must be >= 13.1 - In order to use unit directive AppArmorProfile= libapparmor-devel must be present in buildRequires. - Correct the libseccomp distribution version test must be >= 13.1 - In order to use unit directive AppArmorProfile= libapparmor-devel must be present in buildRequires. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=657
2014-06-05 08:57:37 +02:00
%if 0%{?suse_version} >= 1310
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%ifarch %ix86 x86_64 x32 %arm
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
BuildRequires: pkgconfig(libseccomp)
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=712
2014-07-11 14:49:28 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=661
2014-06-06 14:45:20 +02:00
%if ! 0%{?bootstrap}
- Correct the libseccomp distribution version test must be >= 13.1 - In order to use unit directive AppArmorProfile= libapparmor-devel must be present in buildRequires. - Correct the libseccomp distribution version test must be >= 13.1 - In order to use unit directive AppArmorProfile= libapparmor-devel must be present in buildRequires. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=657
2014-06-05 08:57:37 +02:00
BuildRequires: libapparmor-devel
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=661
2014-06-06 14:45:20 +02:00
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
BuildRequires: pkgconfig(libselinux) >= 2.1.9
- Use pkgconfig symbols for BuildRequires and specify version - Add missing kmod BuildRequires for systemd-gtk OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=249
2012-02-20 11:55:29 +01:00
BuildRequires: pkgconfig(libsepol)
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=594
2014-04-14 17:09:11 +02:00
%if 0%{?suse_version} > 1310
Conflicts: sysvinit
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if 0%{?bootstrap}
- systemd-mini doesn't need dbus-1, only dbus-1-devel OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=408
2013-07-01 14:11:31 +02:00
#!BuildIgnore: dbus-1
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Requires: this-is-only-for-build-envs
- Do not provide %{release} for systemd-analyze - Add more conflicts to -mini packages - Disable Predictable Network interface names until it has been reviewed by network team, with /usr/lib/tmpfiles.d/network.conf. - Don't package /usr/lib/firmware/update (not used) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=367
2013-04-22 16:35:32 +02:00
Conflicts: systemd
- add some more conflicts to make bootstrap work OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=369
2013-04-23 14:55:16 +02:00
Conflicts: kiwi
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%else
# the buildignore is important for bootstrapping
#!BuildIgnore: udev
Requires: %{udevpkgname} >= 172
- split bash-completion support into its own package, no need for sles_version OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=509
2014-02-08 11:46:51 +01:00
Recommends: %{name}-bash-completion
Updating link to change in openSUSE:Factory/systemd revision 5 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=a37db9acbd1b78fc3c3a865fdf1c77bb
2010-09-10 16:07:56 +02:00
Requires: dbus-1 >= 1.4.0
Updating link to change in openSUSE:Factory/systemd revision 6 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=9be1d29ab21fddfc9a76a51ef58ec696
2010-09-27 00:49:25 +02:00
Requires: kbd
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=525
2014-02-28 18:16:33 +01:00
%if 0%{?suse_version} <= 1310
- version 206 , highlights: * Unit files now understand the new %v specifier which resolves to the kernel version string as returned by "uname-r". * "journalctl -b" may now be used to look for boot output of a specific boot. Try "journalctl -b -1" * Creation of "dead" device nodes has been moved from udev into kmod and tmpfiles. * The udev "keymap" data files and tools to apply keyboard specific mappings of scan to key codes, and force-release scan code lists have been entirely replaced by a udev "keyboard" builtin and a hwdb data file. - remove patches now in upstream - systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 - systemd now require the kmod tool in addition to the library. - version 206 , highlights: * Unit files now understand the new %v specifier which resolves to the kernel version string as returned by "uname-r". * "journalctl -b" may now be used to look for boot output of a specific boot. Try "journalctl -b -1" * Creation of "dead" device nodes has been moved from udev into kmod and tmpfiles. * The udev "keymap" data files and tools to apply keyboard specific mappings of scan to key codes, and force-release scan code lists have been entirely replaced by a udev "keyboard" builtin and a hwdb data file. - remove patches now in upstream - systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 - systemd now require the kmod tool in addition to the library. (forwarded request 184035 from elvigia) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=416
2013-07-23 11:21:21 +02:00
Requires: kmod >= 14
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=525
2014-02-28 18:16:33 +01:00
%else
Requires: kmod >= 15
%endif
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
Requires: netcfg
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
Requires: pam-config >= 0.79-5
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
Requires: pwdutils
- Add detect-non-running.patch: fix assertion when running systemctl under non systemd system (git). - Requires presets branding package. - Improve macros a little bit. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=202
2011-09-29 16:00:16 +02:00
Requires: systemd-presets-branding
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=717
2014-07-15 09:40:33 +02:00
Requires: sysvinit-tools
- Update to version 43: + Support optional initialization of the machine ID from the KVM or container configured UUID. + Support immediate reboots with "systemctl reboot -ff" + Show /etc/os-release data in systemd-analyze output + Many bugfixes for the journal, including endianess fixes and ensuring that disk space enforcement works + non-UTF8 strings are refused if used in configuration and unit files. + Register Mimo USB Screens as suitable for automatic seat configuration + Reorder configuration file lookup order. /etc now always overrides /run. + manpages for journal utilities. - Drop fix-c++-compat.patch, no-tmpfs-fsck.patch, systemd-journald-fix-endianess-bug.patch. - Requires util-linux >= 2.21 (needed to fix fsck on tmpfs). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=259
2012-03-16 16:20:47 +01:00
Requires: util-linux >= 2.21
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
Requires(post): coreutils
Requires(post): findutils
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
Explicitly require pam-config for %post of the main package, fixes build Also cleaned up whitespaces in spec and changelog OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=449
2013-10-02 16:37:41 +02:00
%if ! 0%{?bootstrap}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=702
2014-07-03 09:03:56 +02:00
Requires(post): pam-config >= 0.79-5
Explicitly require pam-config for %post of the main package, fixes build Also cleaned up whitespaces in spec and changelog OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=449
2013-10-02 16:37:41 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
Requires(pre): /usr/bin/getent
Requires(pre): /usr/sbin/groupadd
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
Requires(post): /usr/bin/awk
Requires(post): /usr/bin/getent
Requires(post): /usr/bin/setfacl
version 25 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=133
2011-04-22 19:35:38 +02:00
Conflicts: filesystem < 11.5
Conflicts: mkinitrd < 2.7.0
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
Obsoletes: systemd-analyze < 201
- Do not provide %{release} for systemd-analyze - Add more conflicts to -mini packages - Disable Predictable Network interface names until it has been reviewed by network team, with /usr/lib/tmpfiles.d/network.conf. - Don't package /usr/lib/firmware/update (not used) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=367
2013-04-22 16:35:32 +02:00
Provides: systemd-analyze = %{version}
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Source0: http://www.freedesktop.org/software/systemd/systemd-%{version}.tar.xz
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=691
2014-06-26 12:03:25 +02:00
%if ! 0%{?bootstrap}
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
Source1: systemd-rpmlintrc
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=691
2014-06-26 12:03:25 +02:00
%else
Source1: systemd-mini-rpmlintrc
%endif
- Add root-fsck.patch: do not run fsck on / if it is rw - Ship a non null localfs.service, fixes static mount points not being mounted properly. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=171
2011-08-03 18:32:51 +02:00
Source2: localfs.service
- Handle disable_capslock, compose table and kbd_rate - Add rpm macros.systemd file. - Do not disable klogd, it has its own service now. - Handle kexec correctly (bnc#671673). - Disable preload services, they are conflicting with systemd. >>>>>>> .new OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=181
2011-08-23 18:14:51 +02:00
Source3: systemd-sysv-convert
- Create -32bit package (bnc#713319) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=194
2011-09-16 18:30:03 +02:00
Source6: baselibs.conf
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
Source7: libgcrypt.m4
- links more manpages for migrated tools (from Christopher Yeleighton). - disable boot.localnet service, ypbind service will do the right thing now (bnc#716746) - add xdm-display-manager.patch: pull xdm.service instead of display-manager.service (needed until xdm initscript is migrated to native systemd service). - Add fix-permissions-btmp.patch: ensure btmp is owned only by root (bnc#777405). - Have the udev package create a tape group, as referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules (DimStar). - Add fix-bad-memory-access.patch: fix crash in journal rotation. - Add fix-dbus-crash.patch: fix D-Bus caused crash. - Add sync-on-shutdown.patch: ensure sync is done when initiating shutdown. - Add mount-efivars.patch: mount efivars if booting on UEFI. - Ship a empty systemd-journald initscript in systemd-logger to stop insserv to complain about missing syslog dependency. - Update 0001-service-Fix-dependencies-added-when-parsing-insserv..patch with bug fixes from Debian. old: Base:System/systemd new: home:fcrozat:branches:Base:System/systemd rev NoneIndex: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch =================================================================== --- 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 311) +++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 5) @@ -1,17 +1,35 @@ -From 6620bceb7233a830be3635a4f7a7dc75c13a9c8e Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Fri, 30 Sep 2011 14:12:45 +0200 -Subject: [PATCH] service: Fix dependencies added when parsing insserv.conf - ---- - src/service.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -Index: systemd-41/src/service.c +Index: systemd-195/src/core/service.c =================================================================== ---- systemd-41.orig/src/core/service.c -+++ systemd-41/src/core/service.c -@@ -3210,23 +3210,30 @@ static void sysv_facility_in_insserv_con +--- systemd-195.orig/src/core/service.c ++++ systemd-195/src/core/service.c +@@ -3391,12 +3391,13 @@ static void service_notify_message(Unit + + #ifdef HAVE_SYSV_COMPAT + +-#ifdef TARGET_SUSE +-static void sysv_facility_in_insserv_conf(Manager *mgr) { +- FILE *f=NULL; ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) ++static void sysv_parse_insserv_conf(Manager *mgr, const char* filename) { ++ FILE *f = NULL; + int r; + +- if (!(f = fopen("/etc/insserv.conf", "re"))) { ++ if (!(f = fopen(filename, "re"))) { ++ log_error("Failed to open file %s", filename); + r = errno == ENOENT ? 0 : -errno; + goto finish; + } +@@ -3410,7 +3411,7 @@ static void sysv_facility_in_insserv_con + break; + + r = -errno; +- log_error("Failed to read configuration file '/etc/insserv.conf': %s", strerror(-r)); ++ log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); + goto finish; + } + +@@ -3425,23 +3426,30 @@ static void sysv_facility_in_insserv_con Unit *u; if (sysv_translate_facility(parsed[0], NULL, &facility) < 0) continue; @@ -29,12 +47,12 @@ STRV_FOREACH (j, parsed+1) { - if (*j[0]=='+') { - e = UNIT_WANTS; -+ if (*j[0]=='+') ++ if (*j[0] == '+') name = *j+1; - } - else { - e = UNIT_REQUIRES; -+ else ++ else name = *j; - } + if (streq(name, "boot.localfs") || @@ -44,9 +62,54 @@ continue; - r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, e, dep, NULL, true); -+ r = unit_add_dependency_by_name_inverse(u, UNIT_BEFORE, dep, NULL, true); -+ if (*j[0]!='+') ++ r = unit_add_two_dependencies_by_name_inverse(u, UNIT_WANTS, UNIT_BEFORE, dep, NULL, true); ++ if (*j[0] != '+') + r = unit_add_dependency_by_name(u, UNIT_REQUIRES, dep, NULL, true); free(dep); } } +@@ -3454,6 +3462,35 @@ finish: + fclose(f); + + } ++ ++static void sysv_facility_in_insserv_conf(Manager *mgr) { ++ DIR *d =NULL; ++ struct dirent *de; ++ ++#ifdef TARGET_DEBIAN ++ if (!(d = opendir("/etc/insserv.conf.d/"))) ++ if (errno != ENOENT) { ++ log_warning("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); ++ goto finish; ++ } ++ ++ while ((de = readdir(d))) { ++ char *path = NULL; ++ if (ignore_file(de->d_name)) ++ continue; ++ ++ path = join("/etc/insserv.conf.d/", de->d_name, NULL); ++ sysv_parse_insserv_conf(mgr, path); ++ free(path); ++ } ++finish: ++ if (d) ++ closedir(d); ++#endif ++ ++ sysv_parse_insserv_conf(mgr, "/etc/insserv.conf"); ++} ++ + #endif + + static int service_enumerate(Manager *m) { +@@ -3604,7 +3641,7 @@ static int service_enumerate(Manager *m) + + r = 0; + +-#ifdef TARGET_SUSE ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) + sysv_facility_in_insserv_conf (m); + #endif + Index: systemd-mini.changes =================================================================== --- systemd-mini.changes (revision 311) +++ systemd-mini.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd-mini.spec =================================================================== --- systemd-mini.spec (revision 311) +++ systemd-mini.spec (revision 5) @@ -102,6 +102,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -128,6 +129,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -137,6 +140,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -151,8 +162,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -313,6 +322,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -337,6 +347,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -368,8 +384,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -378,11 +400,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -392,7 +409,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -415,8 +432,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -442,8 +458,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -532,6 +552,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -724,6 +746,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -787,7 +813,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -878,6 +908,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: systemd.changes =================================================================== --- systemd.changes (revision 311) +++ systemd.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd.spec =================================================================== --- systemd.spec (revision 311) +++ systemd.spec (revision 5) @@ -97,6 +97,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -123,6 +124,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -132,6 +135,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -146,8 +157,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -308,6 +317,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -332,6 +342,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -363,8 +379,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -373,11 +395,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -387,7 +404,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -410,8 +427,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -437,8 +453,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -527,6 +547,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -719,6 +741,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -782,7 +808,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -873,6 +903,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: fix-bad-memory-access.patch =================================================================== --- fix-bad-memory-access.patch (added) +++ fix-bad-memory-access.patch (revision 5) @@ -0,0 +1,23 @@ +From 7d73c1343be02a59b17de0cd34375deeb815d89c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 20 Nov 2012 00:19:27 +0100 +Subject: [PATCH] journald: fix bad memory access + +https://bugzilla.redhat.com/show_bug.cgi?id=875653 +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: systemd-195/src/journal/journald.c +=================================================================== +--- systemd-195.orig/src/journal/journald.c ++++ systemd-195/src/journal/journald.c +@@ -342,7 +342,7 @@ static void server_rotate(Server *s) { + HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { + r = journal_file_rotate(&f, s->compress, s->seal); + if (r < 0) +- if (f->path) ++ if (f) + log_error("Failed to rotate %s: %s", f->path, strerror(-r)); + else + log_error("Failed to create user journal: %s", strerror(-r)); Index: fix-dbus-crash.patch =================================================================== --- fix-dbus-crash.patch (added) +++ fix-dbus-crash.patch (revision 5) @@ -0,0 +1,32 @@ +From 645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Wed, 31 Oct 2012 11:53:56 +0100 +Subject: [PATCH] dbus-manager: fix a fatal dbus abort in + bus_manager_message_handler() + +If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref() +will be called twice on "reply", causing systemd to crash. So remove +the call to dbus_message_unref(); it is unnecessary because of +the cleanup attribute on "reply". + +[zj: modified to leave one dbus_message_unref() alone, per Colin +Walters' comment.] +--- + src/core/dbus-manager.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index 2010241..3cf3e90 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -1436,7 +1436,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h); + if (r < 0) { + unit_file_list_free(h); +- dbus_message_unref(reply); + return bus_send_error_reply(connection, message, NULL, r); + } + +-- +1.7.10.4 + Index: fix-permissions-btmp.patch =================================================================== --- fix-permissions-btmp.patch (added) +++ fix-permissions-btmp.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-44/tmpfiles.d/systemd.conf +=================================================================== +--- systemd-44.orig/tmpfiles.d/systemd.conf ++++ systemd-44/tmpfiles.d/systemd.conf +@@ -11,7 +11,7 @@ d /run/user 0755 root root 10d + F /run/utmp 0664 root utmp - + + f /var/log/wtmp 0664 root utmp - +-f /var/log/btmp 0600 root utmp - ++f /var/log/btmp 0600 root root - + + d /var/cache/man - - - 30d + Index: mount-efivars.patch =================================================================== --- mount-efivars.patch (added) +++ mount-efivars.patch (revision 5) @@ -0,0 +1,336 @@ +From f271dd97622b656c1c013d181ea615c671cc2438 Mon Sep 17 00:00:00 2001 +From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> +Date: Sat, 27 Oct 2012 11:23:22 +0800 +Subject: [PATCH] systemd: mount the EFI variable filesystem +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add efivarfs to the mount_table in mount-setup.c, so the EFI variable +filesystem will be mounted when systemd executed. + +The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel. + +Cc: Kay Sievers <kay@vrfy.org> +Cc: Lennart Poettering <lennart@poettering.net> +Cc: Mantas Mikulėnas <grawity@gmail.com> +Cc: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> +Cc: Matt Fleming <matt.fleming@intel.com> +Cc: Jeremy Kerr <jeremy.kerr@canonical.com> +Cc: Matthew Garrett <mjg@redhat.com> +Signed-off-by: Lee, Chun-Yi <jlee@suse.com> +--- + src/core/kmod-setup.c | 7 ++++--- + src/core/mount-setup.c | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index cc2a2d9..ce8a8e7 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -31,9 +31,10 @@ + #include "kmod-setup.h" + + static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "unix", "/proc/net/unix" ++ "autofs4", "/sys/class/misc/autofs", ++ "ipv6", "/sys/module/ipv6", ++ "efivarfs", "/sys/firmware/efi/efivars", ++ "unix", "/proc/net/unix" + }; + + #pragma GCC diagnostic push +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 0fd112f..9894c7f 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, + { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, + { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +-- +1.7.10.4 + +From c1e5704657315b436c0409e8172c1fcb76adccad Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:06:27 +0100 +Subject: [PATCH] shared: add is_efiboot() + +--- + src/shared/util.c | 4 ++++ + src/shared/util.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 2a8afae..9983695 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -77,6 +77,10 @@ char **saved_argv = NULL; + static volatile unsigned cached_columns = 0; + static volatile unsigned cached_lines = 0; + ++bool is_efiboot(void) { ++ return access("/sys/firmware/efi", F_OK) >= 0; ++} ++ + size_t page_size(void) { + static __thread size_t pgsz = 0; + long r; +diff --git a/src/shared/util.h b/src/shared/util.h +index e387b12..99972cc 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -90,6 +90,8 @@ union dirent_storage { + #define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m" + #define ANSI_HIGHLIGHT_OFF "\x1B[0m" + ++bool is_efiboot(void); ++ + usec_t now(clockid_t clock); + + dual_timestamp* dual_timestamp_get(dual_timestamp *ts); +-- +1.7.10.4 + +From 1022373284b7562431fb0a6dba45db8af089a0e3 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:54:19 +0100 +Subject: [PATCH] kmod-setup: add conditional module loading callback + +--- + src/core/kmod-setup.c | 32 ++++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index ce8a8e7..383a6b2 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -30,11 +30,17 @@ + + #include "kmod-setup.h" + +-static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "efivarfs", "/sys/firmware/efi/efivars", +- "unix", "/proc/net/unix" ++typedef struct Kmodule { ++ const char *name; ++ const char *directory; ++ bool (*condition_fn)(void); ++} KModule; ++ ++static const KModule kmod_table[] = { ++ { "autofs4", "/sys/class/misc/autofs", NULL } , ++ { "ipv6", "/sys/module/ipv6", NULL }, ++ { "efivarfs", "/sys/firmware/efi/efivars", NULL }, ++ { "unix", "/proc/net/unix", NULL } , + }; + + #pragma GCC diagnostic push +@@ -42,7 +48,8 @@ static const char * const kmod_table[] = { + static void systemd_kmod_log(void *data, int priority, const char *file, int line, + const char *fn, const char *format, va_list args) + { +- log_metav(priority, file, line, fn, format, args); ++ /* library logging is enabled at debug only */ ++ log_metav(LOG_DEBUG, file, line, fn, format, args); + } + #pragma GCC diagnostic pop + +@@ -53,13 +60,15 @@ int kmod_setup(void) { + int err; + + for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) { ++ if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn()) ++ continue; + +- if (access(kmod_table[i+1], F_OK) >= 0) ++ if (access(kmod_table[i].directory, F_OK) >= 0) + continue; + + log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. " + "We'll now try to work around this by loading the module...", +- kmod_table[i]); ++ kmod_table[i].name); + + if (!ctx) { + ctx = kmod_new(NULL, NULL); +@@ -69,13 +78,12 @@ int kmod_setup(void) { + } + + kmod_set_log_fn(ctx, systemd_kmod_log, NULL); +- + kmod_load_resources(ctx); + } + +- err = kmod_module_new_from_name(ctx, kmod_table[i], &mod); ++ err = kmod_module_new_from_name(ctx, kmod_table[i].name, &mod); + if (err < 0) { +- log_error("Failed to load module '%s'", kmod_table[i]); ++ log_error("Failed to lookup module '%s'", kmod_table[i].name); + continue; + } + +@@ -85,7 +93,7 @@ int kmod_setup(void) { + else if (err == KMOD_PROBE_APPLY_BLACKLIST) + log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); + else +- log_error("Failed to insert '%s'", kmod_module_get_name(mod)); ++ log_error("Failed to insert module '%s'", kmod_module_get_name(mod)); + + kmod_module_unref(mod); + } +-- +1.7.10.4 + +From 3dfb265083347cb5700dc38f7cc0f479f378e6e9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:55:23 +0100 +Subject: [PATCH] kmod-setup: mounting efivarfs, *after* we tried to mount it, + is pointless + +The mount() system call, which we issue before loading modules, will trigger +a modprobe by the kernel and block until it returns. Trying to load it again +later, will have exactly the same result as the first time. +--- + src/core/kmod-setup.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 383a6b2..20ab232 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -39,7 +39,6 @@ typedef struct Kmodule { + static const KModule kmod_table[] = { + { "autofs4", "/sys/class/misc/autofs", NULL } , + { "ipv6", "/sys/module/ipv6", NULL }, +- { "efivarfs", "/sys/firmware/efi/efivars", NULL }, + { "unix", "/proc/net/unix", NULL } , + }; + +-- +1.7.10.4 + +From 6aa220e019f9dffd96590b06b68f937985204109 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 17:03:48 +0100 +Subject: [PATCH] mount-setup: try mounting 'efivarfs' only if the system + bootet with EFI + +--- + TODO | 3 --- + src/core/mount-setup.c | 50 ++++++++++++++++++++++++++++++++---------------- + 2 files changed, 34 insertions(+), 19 deletions(-) + +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 9894c7f..98614d0 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -46,14 +46,20 @@ + #define TTY_GID 5 + #endif + ++typedef enum MountMode { ++ MNT_NONE = 0, ++ MNT_FATAL = 1 << 0, ++ MNT_IN_CONTAINER = 1 << 1, ++} MountMode; ++ + typedef struct MountPoint { + const char *what; + const char *where; + const char *type; + const char *options; + unsigned long flags; +- bool fatal; +- bool in_container; ++ bool (*condition_fn)(void); ++ MountMode mode; + } MountPoint; + + /* The first three entries we might need before SELinux is up. The +@@ -62,16 +68,26 @@ typedef struct MountPoint { + #define N_EARLY_MOUNT 4 + + static const MountPoint mount_table[] = { +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, +- { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, +- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, false, true }, +- { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, true }, ++ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_NONE }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ is_efiboot, MNT_NONE }, ++ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, ++ NULL, MNT_IN_CONTAINER }, ++ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_IN_CONTAINER }, ++ { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_IN_CONTAINER }, + }; + + /* These are API file systems that might be mounted by other software, +@@ -119,6 +135,9 @@ static int mount_one(const MountPoint *p, bool relabel) { + + assert(p); + ++ if (p->condition_fn && !p->condition_fn()) ++ return 0; ++ + /* Relabel first, just in case */ + if (relabel) + label_fix(p->where, true, true); +@@ -131,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) { + return 0; + + /* Skip securityfs in a container */ +- if (!p->in_container && detect_container(NULL) > 0) ++ if (!(p->mode & MNT_IN_CONTAINER) && detect_container(NULL) > 0) + return 0; + + /* The access mode here doesn't really matter too much, since +@@ -149,8 +168,8 @@ static int mount_one(const MountPoint *p, bool relabel) { + p->type, + p->flags, + p->options) < 0) { +- log_full(p->fatal ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); +- return p->fatal ? -errno : 0; ++ log_full((p->mode & MNT_FATAL) ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); ++ return (p->mode & MNT_FATAL) ? -errno : 0; + } + + /* Relabel again, since we now mounted something fresh here */ +@@ -289,7 +308,6 @@ int mount_cgroup_controllers(char ***join_controllers) { + p.type = "cgroup"; + p.options = options; + p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV; +- p.fatal = false; + + r = mount_one(&p, true); + free(controller); +-- +1.7.10.4 + Index: sync-on-shutdown.patch =================================================================== --- sync-on-shutdown.patch (added) +++ sync-on-shutdown.patch (revision 5) @@ -0,0 +1,49 @@ +From 0049f05a8bb82c3e084bacc5945596761d706c55 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 16 Nov 2012 01:30:29 +0100 +Subject: [PATCH] shutdown: readd explicit sync() when shutting down + +As it turns out reboot() doesn't actually imply a file system sync, but +only a disk sync. Accordingly, readd explicit sync() invocations +immediately before we invoke reboot(). + +This is much less dramatic than it might sounds as we umount all +disks/read-only remount them anyway before going down. +--- + src/core/service.c | 1 + + src/core/shutdown.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/core/service.c b/src/core/service.c +index cf08485..df72aba 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2485,6 +2485,7 @@ static int service_start_limit_test(Service *s) { + + case SERVICE_START_LIMIT_REBOOT_IMMEDIATE: + log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id); ++ sync(); + reboot(RB_AUTOBOOT); + break; + +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index cc8c57b..b59aef1 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -273,6 +273,13 @@ int main(int argc, char *argv[]) { + } + } + ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. So let's do this here, but not ++ * needlessly slow down containers. */ ++ if (!in_container) ++ sync(); ++ + if (cmd == LINUX_REBOOT_CMD_KEXEC) { + + if (!in_container) { +-- +1.7.10.4 + Index: systemd-journald.init =================================================================== --- systemd-journald.init (added) +++ systemd-journald.init (revision 5) @@ -0,0 +1,33 @@ +#! /bin/sh +# +# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# /etc/init.d/systemd-journald +# +### BEGIN INIT INFO +# Provides: syslog +# Required-Start: $null +# Required-Stop: $null +# Default-Start: 2 3 5 +# Default-Stop: +# Short-Description: compat wrapper for journald +# Description: compat wrapper for journald +### END INIT INFO + +. /etc/rc.status + +rc_reset + +case "$1" in + start|stop|restart) + rc_failed 3 + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +rc_exit Index: xdm-display-manager.patch =================================================================== --- xdm-display-manager.patch (added) +++ xdm-display-manager.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-195/units/graphical.target +=================================================================== +--- systemd-195.orig/units/graphical.target ++++ systemd-195/units/graphical.target +@@ -11,7 +11,7 @@ Documentation=man:systemd.special(7) + Requires=multi-user.target + After=multi-user.target + Conflicts=rescue.target +-Wants=display-manager.service ++Wants=xdm.service + AllowIsolate=yes + + [Install] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=312
2012-11-20 13:10:12 +01:00
Source8: systemd-journald.init
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
Source9: nss-myhostname-config
We talked about using %patch, but in that case I would need a tarball of systemd in rpm-macros package which depends on xz which is part of many circles. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=399
2013-06-19 13:05:44 +02:00
Source10: macros.systemd.upstream
- Add set-ignoreonisolate-noauto-cryptsetup.patch: ensure noauto encrypted mounts survives runlevel changes (bnc#843085). - Add 0001-Fix-buffer-overrun-when-enumerating-files.patch: fix logind crash when /run/systemd/sessions was too big (bnc#840055, initial fix from hpj@suse.com). - Update sysctl-handle-boot-sysctl.conf-kernel_release.patch to only check for /boot/sysctl.conf-<uname -r> presence. - Add service wrapper for after.local (bnc#778715). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=447
2013-10-01 09:23:27 +02:00
Source11: after-local.service
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Source1060: boot.udev
- Rename (fix typo in script name): udev-generate-peristent-rule.sh to udev-generate-persistent-rule.sh - Rename (fix typo in script name): udev-generate-peristent-rule.sh to udev-generate-persistent-rule.sh OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=728
2014-07-24 11:03:14 +02:00
Source1063: udev-generate-persistent-rule.sh
add feature 316824 and address bug 869142 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=573
2014-03-25 14:47:22 +01:00
Source1064: systemd-sleep-grub
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=715
2014-07-14 17:05:04 +02:00
Source1065: systemd-remount-tmpfs
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=560
2014-03-14 12:10:20 +01:00
#
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
# PATCH-FIX-UPSTREAM avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch lnussel@suse.com bnc#791101 -- avoid assertion if invalid address familily is passed to gethostbyaddr_r
Patch0: avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch
- Rebase parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch to fix memory corruption (thanks to Michal Vyskocil) (bnc#820454). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=383
2013-05-21 11:16:19 +02:00
# PATCH-FIX-UPSTREAM optionally-warn-if-nss-myhostname-is-called.patch lnussel@suse.com -- optionally warn if nss-myhostname is called
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
Patch1: optionally-warn-if-nss-myhostname-is-called.patch
- Handle disable_capslock, compose table and kbd_rate - Add rpm macros.systemd file. - Do not disable klogd, it has its own service now. - Handle kexec correctly (bnc#671673). - Disable preload services, they are conflicting with systemd. >>>>>>> .new OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=181
2011-08-23 18:14:51 +02:00
# handle SUSE specific kbd settings
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
Patch3: handle-disable_caplock-and-compose_table-and-kbd_rate.patch
Patch4: handle-numlock-value-in-etc-sysconfig-keyboard.patch
- Replace parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch patch with insserv-generator.patch: no longer patch systemd main binary but generate systemd drop-in files using a generator, for insserv.conf compatibility. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=410
2013-07-02 22:42:56 +02:00
Patch6: insserv-generator.patch
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
Patch7: service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch
Patch8: module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch
Patch9: remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch
Patch12: Fix-run-lock-directories-permissions-to-follow-openSUSE-po.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
Patch13: 0001-units-systemd-sysctl.service.in-run-after-load-modul.patch
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
Patch15: timedate-add-support-for-openSUSE-version-of-etc-sysconfig.patch
Patch16: fix-support-for-boot-prefixed-initscript-bnc-746506.patch
Patch17: restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch
Patch18: fix-owner-of-var-log-btmp.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM Avoid error message about not existing getty@3270 file
Patch19: 0004-getty-generator-properly-escape-instance-names.patch
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
# PATCH-FIX-OPENSUSE ensure-ask-password-wall-starts-after-getty-tty1.patch -- don't start getty on tty1 until all password request are done
Patch5: ensure-ask-password-wall-starts-after-getty-tty1.patch
# PATCH-FIX-OPENSUSE handle-root_uses_lang-value-in-etc-sysconfig-language.patch bnc#792182 fcrozat@suse.com -- handle ROOT_USES_LANG=ctype
Patch20: handle-root_uses_lang-value-in-etc-sysconfig-language.patch
# PATCH-FIX-OPENSUSE allow-multiple-sulogin-to-be-started.patch bnc#793182 fcrozat@suse.com -- handle multiple sulogin
Patch21: allow-multiple-sulogin-to-be-started.patch
# PATCH-FIX-OPENSUSE handle-SYSTEMCTL_OPTIONS-environment-variable.patch bnc#798620 fcrozat@suse.com -- handle SYSTEMCTL_OPTIONS environment variable
Patch22: handle-SYSTEMCTL_OPTIONS-environment-variable.patch
# PATCH-FIX-OPENSUSE apply-ACL-for-nvidia-device-nodes.patch bnc#808319 -- set ACL on nvidia devices
Patch27: apply-ACL-for-nvidia-device-nodes.patch
- apply-ACL-for-nvidia-uvm-device-node.patch: set ACL on nvidia-uvm device (bnc#879767). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=652
2014-06-03 16:52:37 +02:00
# PATCH-FIX-OPENSUSE apply-ACL-for-nvidia-uvm-device-node.patch bnc#879767 -- set ACL on nvidia-uvm device
Patch28: apply-ACL-for-nvidia-uvm-device-node.patch
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
# PATCH-FIX-OPENSUSE Revert-service-drop-support-for-SysV-scripts-for-the-early.patch fcrozat@suse.com -- handle boot.* initscripts
Patch37: Revert-service-drop-support-for-SysV-scripts-for-the-early.patch
- Add sysctl-handle-boot-sysctl.conf-kernel_release.patch: ensure /boot/sysctl.conf-<kernel_release> is handled (bnc#809420). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=382
2013-05-17 17:16:28 +02:00
# PATCH-FIX-OPENSUSE systemd-tmp-safe-defaults.patch FATE#314974 max@suse.de -- Return to SUSE's "safe defaults" policy on deleting files from tmp direcorie.
- Fix regression in the default for tmp auto-deletion (systemd-tmp-safe-defaults.patch, FATE#314974). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=364
2013-04-19 16:00:28 +02:00
Patch39: systemd-tmp-safe-defaults.patch
- Add sysctl-handle-boot-sysctl.conf-kernel_release.patch: ensure /boot/sysctl.conf-<kernel_release> is handled (bnc#809420). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=382
2013-05-17 17:16:28 +02:00
# PATCH-FIX-OPENSUSE sysctl-handle-boot-sysctl.conf-kernel_release.patch bnc#809420 fcrozat@suse.com -- handle /boot/sysctl.conf-<kernel_release> file
Patch40: sysctl-handle-boot-sysctl.conf-kernel_release.patch
- Update to release 204: + systemd-nspawn creates etc/resolv.conf in container if needed. + systemd-nspawn will store metadata about container in container cgroup including its root directory. + cgroup hierarchy has been reworked, all objects are now suffxed (with .session for user sessions, .user for users, .nspawn for containers). All cgroup names are now escaped to preven collision of object names. + systemctl list-dependencies gained --plain, --reverse, --after and --before switches. + systemd-inhibit shows processes name taking inhibitor lock. + nss-myhostname will now resolve "localhost" implicitly. + .include is not allowed recursively anymore and only in unit files. Drop-in files should be favored in most cases. + systemd-analyze gained "critical-chain" command, to get slowest chain of units run during boot-up. + systemd-nspawn@.service has been added to easily run nspawn container for system services. Just start "systemd-nspawn@foobar.service" and container from /var/lib/container/foobar" will be booted. + systemd-cgls has new --machine parameter to list processes from one container. + ConditionSecurity= can now check for apparmor and SMACK. + /etc/systemd/sleep.conf has been introduced to configure which kernel operation will be execute when "suspend", "hibernate" or "hybrid-sleep" is requrested. It allow new kernel "freeze" state to be used too. (This setting won't have any effect if pm-utils is installed). + ENV{SYSTEMD_WANTS} in udev rules will now implicitly escape passed argument if applicable. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=388
2013-05-29 17:26:40 +02:00
# PATCH-FIX-OPENSUSE ensure-shortname-is-set-as-hostname-bnc-820213.patch bnc#820213 fcrozat@suse.com -- Do not set anything beyond first dot as hostname
Patch41: ensure-shortname-is-set-as-hostname-bnc-820213.patch
- version 207, distribution specific changes follow, for overall release notes see NEWS. - Fixed: * Failed at step PAM spawning /usr/lib/systemd/systemd: Operation not permitted * Fix shutdown hang "a stop job is running for Session 1 of user root" that was reported in opensuse-factory list. - systemd-sysctl no longer reads /etc/sysctl.conf however backward compatbility is to be provides by a symlink created at %post. - version 207, distribution specific changes follow, for overall release notes see NEWS. - Fixed: * Failed at step PAM spawning /usr/lib/systemd/systemd: Operation not permitted * Fix shutdown hang "a stop job is running for Session 1 of user root" that was reported in opensuse-factory list. - systemd-sysctl no longer reads /etc/sysctl.conf however backward compatbility is to be provides by a symlink created at %post. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=429
2013-09-13 09:25:15 +02:00
Patch42: systemd-pam_config.patch
- Add 0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch: fix acpi memleak. - Add 0002-fix-lingering-references-to-var-lib-backlight-random.patch: fix invalid path in documentation. - Add 0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch: fix invalid memory free. - Add 0004-systemctl-fix-name-mangling-for-sysv-units.patch: fix name mangling for sysv units. - Add 0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch: fix OOM handling. - Add 0006-journald-add-missing-error-check.patch: add missing error check. - Add 0007-bus-fix-potentially-uninitialized-memory-access.patch: fix uninitialized memory access. - Add 0008-dbus-fix-return-value-of-dispatch_rqueue.patch: fix return value. - Add 0009-modules-load-fix-error-handling.patch: fix error handling. - Add 0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch: fix incorrect memory access. - Add 0011-strv-don-t-access-potentially-NULL-string-arrays.patch: fix incorrect memory access. - Add 0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch: fix invalid pointer. - Add 0014-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch: OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=452
2013-10-04 14:28:12 +02:00
version 25 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=133
2011-04-22 19:35:38 +02:00
# Upstream First - Policy:
# Never add any patches to this package without the upstream commit id
# in the patch. Any patches added here without a very good reason to make
# an exception will be silently removed with the next version update.
- disable nss-myhostname warning (bnc#783841) => disable-nss-myhostname-warning-bnc-783841.diff - disable nss-myhostname warning (bnc#783841) => disable-nss-myhostname-warning-bnc-783841.diff OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=346
2013-02-15 15:53:23 +01:00
# PATCH-FIX-OPENSUSE disable-nss-myhostname-warning-bnc-783841.diff lnussel@suse.de -- disable nss-myhostname warning (bnc#783841)
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
Patch23: disable-nss-myhostname-warning-bnc-783841.patch
- Add early-sync-shutdown.patch: start sync just when shutdown.target is beginning - Update parse-multiline-env-file.patch to better handle continuing lines. - Add handle-HOSTNAME.patch: handle /etc/HOSTNAME (bnc#803653). - Add systemctl-print-wall-on-if-successful.patch: only print on wall if successful. - Add improve-bash-completion.patch: improve bash completion. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=348
2013-02-16 10:43:26 +01:00
# PATCH-FIX-OPENSUSE handle-HOSTNAME.patch fcrozat@suse.com -- handle /etc/HOSTNAME (bnc#803653)
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
Patch24: handle-etc-HOSTNAME.patch
- remove pm-utils-hooks-compat.sh again, pm-utils built-in hooks partially duplicate hooks run by systemd which may potentially lead to problems, instead temporarily re-enable Forward-suspend-hibernate-calls-to-pm-utils.patch until boo#904828 can be addressed properly - fix bashisms in write_net_rules script - update patches: * 1053-better-checks-in-write_net_rules.patch - remove pm-utils-hooks-compat.sh again, pm-utils built-in hooks partially duplicate hooks run by systemd which may potentially lead to problems, instead temporarily re-enable Forward-suspend-hibernate-calls-to-pm-utils.patch until boo#904828 can be addressed properly OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=821
2014-11-20 13:21:44 +01:00
# PATCH-FIX-OPENSUSE forward to pm-utils -- until boo#904828 is addressed
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=574
2014-03-25 18:29:50 +01:00
Patch25: Forward-suspend-hibernate-calls-to-pm-utils.patch
- Update to release 202: + 'systemctl list-jobs' got some polishing. '--type=' argument may now be passed more than once. 'systemctl list-sockets' has been added. + systemd gained a new unit 'systemd-static-nodes.service'     that generates static device nodes earlier during boot, and     can run in conjunction with udev. + systemd-nspawn now places all containers in the new /machine     top-level cgroup directory in the name=systemd hierarchy. + bootchart can now store its data in the journal. + journactl can now take multiple --unit= and --user-unit=     switches. + The cryptsetup logic now understands the "luks.key=" kernel     command line switch. If a configured key file is missing, it will fallback to prompting the user. - Rebase some patches - Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch to properly handle SYSTEMCTL_OPTIONS - Fix regression in the default for tmp auto-deletion (systemd-tmp-safe-defaults.patch, FATE#314974). - Add chromebook lid switch as a power switch to logind rule to enable suspend on lid close - Update to release 202: + 'systemctl list-jobs' got some polishing. '--type=' argument may now be passed more than once. 'systemctl list-sockets' has been added. + systemd gained a new unit 'systemd-static-nodes.service' OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=365
2013-04-19 22:31:17 +02:00
# PATCH-FIX-UPSTREAM rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch rjschwei@suse.com -- add lid switch of ARM based Chromebook as a power switch to logind
Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch
emergency.service failed to start because sulogin is in /usr/sbin now. Add use-usr-sbin-sulogin-for-emergency-service.patch to fix the path in unit file. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=415
2013-07-14 15:56:23 +02:00
# PATCH-FIX-OPENSUSE use-usr-sbin-sulogin-for-emergency-service.patch arvidjaar@gmail.com -- fix path to sulogin
Patch46: use-usr-sbin-sulogin-for-emergency-service.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=547
2014-03-12 15:31:57 +01:00
# PATCH-FIX-OPENSUSE Make systemd talk with dbus-daemon even on big endian
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=560
2014-03-14 12:10:20 +01:00
Patch47: 0001-sd-bus-don-t-look-for-a-64bit-value-when-we-only-hav.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=493
2014-01-23 13:56:59 +01:00
# PATCH-FIX-OPENSUSE make-emergency.service-conflict-with-syslog.socket.patch (bnc#852232)
Patch84: make-emergency.service-conflict-with-syslog.socket.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=497
2014-01-28 13:57:54 +01:00
# PATCH-FIX-SUSE 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch
Patch86: 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=501
2014-01-30 13:35:04 +01:00
# PATCH-FIX-SUSE 0001-On_s390_con3270_disable_ANSI_colour_esc.patch
Patch90: 0001-On_s390_con3270_disable_ANSI_colour_esc.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=505
2014-02-05 12:33:45 +01:00
# PATCH-FIX-SUSE plymouth-quit-and-wait-for-emergency-service.patch -- Make sure that no plymouthd is locking the tty
Patch91: plymouth-quit-and-wait-for-emergency-service.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=517
2014-02-14 17:08:20 +01:00
# PATCH-FIX-SUSE 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch -- Avoid systemd crash on resume (bnc#861488)
Patch93: 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
Patch114: 0008-Reset-signal-mask-on-re-exec-to-init.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
# PATCH-FIX-SUSE 0001-make-209-working-on-older-dist.patch werner@suse.com
Patch117: 0001-make-209-working-on-older-dist.patch
# PATCH-FIX-SUSE 0001-make-fortify-happy-with-ppoll.patch werner@suse.com
Patch119: 0001-make-fortify-happy-with-ppoll.patch
# PATCH-FIX-SUSE 0001-avoid-abort-due-timeout-at-user-service.patch werner@suse.com
Patch120: 0001-avoid-abort-due-timeout-at-user-service.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch121: 0001-login-fix-pos-array-allocation.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch122: 0002-login-set-pos-slot-to-fallback-on-pos-eviction.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch123: 0003-login-Allow-calling-org.freedesktop.login1.Seat.Swit.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch124: 0004-fix-typo-in-iDRAC-network-interface-name-irdac-idrac.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch125: 0005-Replace-var-run-with-run-in-remaining-places.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch126: 0006-Revert-back-to-var-run-at-a-couple-of-problems.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch127: 0007-README-document-that-var-run-must-be-a-symlink-run.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch128: 0008-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch129: 0009-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch130: 0010-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch131: 0011-logs-show-fix-corrupt-output-with-empty-messages.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=538
2014-03-07 13:54:16 +01:00
Patch132: 0012-journalctl-refuse-extra-arguments-with-verify-and-si.patch
# PATCH-FIX-USTREAM added at 2014/03/03
Patch133: 0014-nspawn-fix-detection-of-missing-proc-self-loginuid.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
# PATCH-FIX-USTREAM added at 2014/03/07
Patch134: 0001-Fix-systemd-stdio-bridge-symlink.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch135: 0002-execute-free-directory-path-if-we-fail-to-remove-it-.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch136: 0003-Do-not-print-invalid-UTF-8-in-error-messages.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch137: 0004-man-document-missing-options-of-systemd-run.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch138: 0005-systemd-run-add-some-extra-safety-checks.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch139: 0006-journal-assume-that-next-entry-is-after-previous-ent.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch140: 0007-journal-forget-file-after-encountering-an-error.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch141: 0008-core-correctly-unregister-PIDs-from-PID-hashtables.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch142: 0009-logind-fix-reference-to-systemd-user-sessions.servic.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch143: 0010-man-update-link-to-LSB.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch144: 0011-man-systemd-bootchart-fix-spacing-in-command.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch145: 0012-man-add-missing-comma.patch
# PATCH-FIX-USTREAM added at 2014/03/07
Patch146: 0013-units-Do-not-unescape-instance-name-in-systemd-backl.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=543
2014-03-11 12:03:08 +01:00
# PATCH-FIX-USTREAM added at 2014/03/11
Patch147: 0001-core-busname-add-lookup-string-for-BUSNAME_FAILURE_S.patch
# PATCH-FIX-USTREAM added at 2014/03/11
Patch148: 0002-manager-flush-memory-stream-before-using-the-buffer.patch
# PATCH-FIX-USTREAM added at 2014/03/11
Patch149: 0003-busname-don-t-drop-service-from-the-result-string.patch
# PATCH-FIX-USTREAM added at 2014/03/11
Patch150: 0004-fix-off-by-one-error-in-array-index-assertion.patch
# PATCH-FIX-USTREAM added at 2014/03/11
Patch151: 0005-logind-fix-policykit-checks.patch
# PATCH-FIX-USTREAM added at 2014/03/11
Patch152: 0006-rules-mark-loop-device-as-SYSTEMD_READY-0-if-no-file.patch
# PATCH-FIX-USTREAM added at 2014/03/11
Patch153: 0008-man-multiple-sleep-modes-are-to-be-separated-by-whit.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=565
2014-03-19 13:11:12 +01:00
# PATCH-FIX-USTREAM added at 2014/03/18
Patch154: 0001-gpt-auto-generator-don-t-return-OOM-on-parentless-de.patch
# PATCH-FIX-USTREAM added at 2014/03/18
Patch155: 0002-bus-fix-memory-leak-when-kdbus-is-not-enabled.patch
# PATCH-FIX-USTREAM added at 2014/03/18
Patch157: 0006-Do-not-return-1-EINVAL-on-allocation-error.patch
# PATCH-FIX-USTREAM added at 2014/03/18
Patch158: 0007-networkd-fix-typo.patch
# PATCH-FIX-USTREAM added at 2014/03/18
Patch159: 0008-sd-bus-don-t-access-invalid-memory-if-a-signal-match.patch
# PATCH-FIX-USTREAM added at 2014/03/18
Patch160: 0009-sd-bus-don-t-choke-if-somebody-sends-us-a-message-wi.patch
# PATCH-FIX-USTREAM added at 2014/03/18
Patch161: 0012-journald-remove-stray-reset-of-error-return-value.patch
# PATCH-FIX-USTREAM added at 2014/03/18
Patch162: 0013-core-libsystemd-systemd-timedate-udev-spelling-fixes.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=580
2014-03-28 13:59:18 +01:00
# PATCH-FIX-USTREAM added at 2014/03/28
Patch163: 0001-cgroup-it-s-not-OK-to-invoke-alloca-in-loops.patch
# PATCH-FIX-USTREAM added at 2014/03/28
Patch164: 0002-machined-fix-Kill-bus-call-on-machine-objects-when-w.patch
# PATCH-FIX-USTREAM added at 2014/03/28
Patch165: 0003-sd-bus-don-t-use-assert_return-to-check-for-disconne.patch
# PATCH-FIX-USTREAM added at 2014/03/28
Patch166: 0004-core-don-t-try-to-relabel-mounts-before-we-loaded-th.patch
# PATCH-FIX-USTREAM added at 2014/03/28
Patch167: 0005-sd-daemon-fix-incorrect-variable-access.patch
# PATCH-FIX-USTREAM added at 2014/03/28
Patch168: 0006-sd-event-initialization-perturbation-value-right-bef.patch
# PATCH-FIX-USTREAM added at 2014/03/28
Patch169: 0007-sd-event-don-t-accidentally-turn-of-watchdog-timer-e.patch
# PATCH-FIX-USTREAM added at 2014/03/28
Patch170: 0008-systemctl-kill-mode-is-long-long-gone-don-t-mention-.patch
# PATCH-FIX-USTREAM added at 2014/03/28
Patch171: 0009-ask-password-when-the-user-types-a-overly-long-passw.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
# PATCH-FIX-USTREAM added at 2014/04/08
Patch172: 0001-journal-fix-export-of-messages-containing-newlines.patch
# PATCH-FIX-USTREAM added at 2014/04/08
Patch173: 0002-systemctl-update-NAME-to-PATTERN-in-help.patch
# PATCH-FIX-USTREAM added at 2014/04/08
Patch174: 0003-tty-ask-password-agent-return-negative-errno.patch
# PATCH-FIX-USTREAM added at 2014/04/08
Patch175: 0004-systemd-python-use-.hex-instead-of-.get_hex.patch
# PATCH-FIX-USTREAM added at 2014/04/08
Patch176: 0005-systemd-python-fix-failing-assert.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
# PATCH-FIX-OPENSUSE 0009-make-xsltproc-use-correct-ROFF-links.patch -- Make ROFF links working again in manual pages (bnc#842844)
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch177: 0009-make-xsltproc-use-correct-ROFF-links.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
# PATCH-FIX-OPENSUSE 0010-do-not-install-sulogin-unit-with-poweroff.patch -- Avoid installing console-shell.service (bnc#849071)
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch178: 0010-do-not-install-sulogin-unit-with-poweroff.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
# PATCH-FIX-SUSE 0001-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch179: 0001-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
# PATCH-FIX-OPENSUSE 0014-journald-with-journaling-FS.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch180: 0014-journald-with-journaling-FS.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
# PATCH-FIX-SUSE 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch181: 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
# PATCH-FIX-SUSE 0019-make-completion-smart-to-be-able-to-redirect.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch182: 0019-make-completion-smart-to-be-able-to-redirect.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
# PATCH-FIX-SUSE 0001-add-network-device-after-NFS-mount-units.patch werner@suse.com
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch183: 0001-add-network-device-after-NFS-mount-units.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
# PATCH-FIX-SUSE 0022-systemd-tmpfiles-ownerkeep.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch184: 0022-systemd-tmpfiles-ownerkeep.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=553
2014-03-13 15:14:59 +01:00
# PATCH-FIX-SUSE systemd-powerd-initctl-support.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch185: systemd-powerd-initctl-support.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=565
2014-03-19 13:11:12 +01:00
# PATCH-FIX-SUSE systemctl-set-default-target.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch186: systemctl-set-default-target.patch
add feature 316824 and address bug 869142 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=573
2014-03-25 14:47:22 +01:00
# PATCH-FIX-SUSE prepare-suspend-to-disk.patch (fate #316824)
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch187: prepare-suspend-to-disk.patch
add feature 316824 and address bug 869142 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=573
2014-03-25 14:47:22 +01:00
# PATCH-FIX-SUSE boot-local-start.patch (bnc #869142)
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch188: boot-local-start.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=574
2014-03-25 18:29:50 +01:00
# PATCH-FIX-SUSE avoid random hangs on timeouts due lost cwd at terminating user manager
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch189: avoid-random-hangs-on-timeouts-due-lost-cwd.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
# PATCH-FIX-SUSE systemd-install-compat_pkgconfig-always.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch190: systemd-install-compat_pkgconfig-always.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=546
2014-03-12 14:12:18 +01:00
# PATCH-FIX-OPENSUSE systemd-dbus-system-bus-address.patch always use /run/dbus not /var/run
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch191: systemd-dbus-system-bus-address.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=551
2014-03-13 14:46:47 +01:00
# PATCH-FIX-SUSE During linkage of systemd-cryptsetup let linker find libudev for libdevmapper
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch192: let-linker-find-libudev-for-libdevmapper.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=590
2014-04-10 11:14:13 +02:00
# PATCH-FIX-SUSE Make sure that rpcbind socket as well as service is up with the target
Patch193: portmap-wants-rpcbind-socket.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
# PATCH-FIX-USTREAM added at 2014/03/11
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=589
2014-04-10 11:12:03 +02:00
Patch194: 0007-dbus-suppress-duplicate-and-misleading-messages.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=594
2014-04-14 17:09:11 +02:00
# PATCH-FIX-USTREAM added at 2014/03/14
Patch195: 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=668
2014-06-11 16:10:42 +02:00
# PATCH-FIX-SUSE Do not clean the data base files of the manual pages
Patch196: tmpfiles-do-not-clean-for-mandb-index-files.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=595
2014-04-15 13:25:54 +02:00
# PATCH-FIX-SUSE Avoid that emergency and rescue sulogin are fighting on console
Patch197: rescue-emergency-target-conflicts.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=603
2014-04-17 15:36:28 +02:00
# PATCH-FIX-SUSE Avoid a divide by zero sigtrap
Patch198: avoid-divide-by-zero-sigtrap.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=610
2014-04-28 11:54:18 +02:00
# PATCH-FIX-USTREAM added at 2014/04/28
Patch199: 0001-bash-completion-fix-__get_startable_units.patch
# PATCH-FIX-USTREAM added at 2014/04/28
Patch200: 0002-sysctl-replaces-some-slashes-with-dots.patch
# PATCH-FIX-USTREAM added at 2014/04/28
Patch201: 0003-delta-do-not-use-unicode-chars-in-C-locale.patch
# PATCH-FIX-USTREAM added at 2014/04/28
Patch202: 0004-implement-a-union-to-pad-out-file_handle.patch
# PATCH-FIX-SUSE System fails to boot if nfs mounts get added to fstab (bnc#874665)
Patch203: respect-nfs-bg-option.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=614
2014-05-02 12:15:38 +02:00
# PATCH-FIX-UPSTREAM Stop useless messages on dual_timestamp_is_set is failed.
Patch204: shut-up-annoying-assertion-monotonic-clock-message.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=616
2014-05-05 16:06:21 +02:00
# PATCH-FIX-UPSTREAM Fix uninitialized memory
Patch206: 0001-sd-rtnl-message-append-fix-uninitialized-memory.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=619
2014-05-07 11:34:13 +02:00
# PATCH-FIX-UPSTREAM Make systemd user journal accessible by users (bnc#876694)
Patch207: 0001-tmpfiles-fix-permissions-on-new-journal-files.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=621
2014-05-07 12:43:30 +02:00
# PATCH-FIX-SUSE Do not ignores option 'noauto' in /etc/crypttab (bnc#742774)
Patch208: parse-crypttab-for-noauto-option.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=624
2014-05-13 10:48:13 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/12
Patch209: 0001-errno-make-sure-to-handle-the-3-errnos-that-are-alia.patch
# PATCH-FIX-UPSTREAM added at 2014/05/12
Patch211: 0003-analyze-fix-plot-with-bad-y-size.patch
# PATCH-FIX-UPSTREAM added at 2014/05/12
Patch212: 0004-job-add-waiting-jobs-to-run-queue-in-unit_coldplug.patch
# PATCH-FIX-UPSTREAM added at 2014/05/12
Patch213: 0005-job-always-add-waiting-jobs-to-run-queue-during-cold.patch
# PATCH-FIX-UPSTREAM added at 2014/05/12
Patch214: 0001-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch
# PATCH-FIX-UPSTREAM added at 2014/05/12
Patch215: 0002-backlight-do-nothing-if-max_brightness-is-0.patch
# PATCH-FIX-UPSTREAM added at 2014/05/12
Patch216: 0003-backlight-unify-error-messages.patch
# PATCH-FIX-UPSTREAM added at 2014/05/12
Patch217: 0004-backlight-warn-if-kernel-exposes-backlight-device-wi.patch
# PATCH-FIX-UPSTREAM added at 2014/05/12
Patch218: 0005-backlight-handle-saved-brightness-exceeding-max-brig.patch
# PATCH-FIX-SUSE Do not poison kmsg ring buffer with systemd/udev messages (bnc#877021)
Patch219: log-target-null-instead-kmsg.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=626
2014-05-14 09:40:46 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/14
Patch220: 0001-replace-more-dup-by-F_DUPFD_CLOEXEC.patch
# PATCH-FIX-UPSTREAM added at 2014/05/14
Patch221: 0002-pam_systemd-use-F_DUPFD_CLOEXEC-when-dupping-session.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=627
2014-05-16 13:48:04 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/16
Patch222: 0001-core-close-socket-fds-asynchronously.patch
# PATCH-FIX-UPSTREAM added at 2014/05/16
Patch223: 0002-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch
# PATCH-FIX-UPSTREAM added at 2014/05/16
Patch224: 0003-core-make-sure-to-serialize-jobs-for-all-units.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=633
2014-05-19 15:33:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/19
Patch225: 0001-logind-ignore-lid-switch-if-more-than-1-display-is-c.patch
# PATCH-FIX-UPSTREAM added at 2014/05/19
Patch226: 0002-logind-fix-printf-format.patch
# PATCH-FIX-UPSTREAM added at 2014/05/19
Patch227: 0003-logind-ignore-lid-switch-events-for-30s-after-each-s.patch
# PATCH-FIX-UPSTREAM added at 2014/05/19
Patch228: 0004-logind-Do-not-fail-display-count-if-a-device-has-no-.patch
# PATCH-FIX-UPSTREAM added at 2014/05/19
Patch229: 0005-logind-move-lid-switch-handling-from-logind-main-to-.patch
# PATCH-FIX-UPSTREAM added at 2014/05/19
Patch230: 0006-man-clarify-that-the-ExecReload-command-should-be-sy.patch
# PATCH-FIX-UPSTREAM added at 2014/05/19
Patch231: 0007-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch
# PATCH-FIX-UPSTREAM added at 2014/05/19
Patch232: 0008-man-update-journald-rate-limit-defaults.patch
# PATCH-FIX-UPSTREAM added at 2014/05/19
Patch233: 0009-nspawn-properly-format-container_uuid-in-UUID-format.patch
# PATCH-FIX-UPSTREAM added at 2014/05/19
Patch234: 0010-logind-allow-suspending-if-there-are-no-displays.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=635
2014-05-20 13:32:38 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch235: 0001-hwdb-Update-database-of-Bluetooth-company-identifier.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch236: 0002-hwdb-Update-database-of-Bluetooth-company-identifier.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch237: 0003-hwdb-Update-database-of-Bluetooth-company-identifier.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch238: 0004-hwdb-Update-database-of-Bluetooth-company-identifier.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch239: 0005-hwdb-Update-database-of-Bluetooth-company-identifier.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=636
2014-05-20 14:13:39 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch240: 0001-conf-parser-silently-ignore-sections-starting-with-X.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch241: 0002-man-note-that-entire-sections-can-now-be-ignored.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=637
2014-05-20 16:12:28 +02:00
Patch242: 0004-machined-make-sure-GetMachineAddresses-is-available-.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=636
2014-05-20 14:13:39 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/20
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=637
2014-05-20 16:12:28 +02:00
Patch243: 0005-core-Filter-by-state-behind-the-D-Bus-API-not-in-the.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=636
2014-05-20 14:13:39 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/20
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=637
2014-05-20 16:12:28 +02:00
Patch244: 0006-login-add-mir-to-the-list-of-session-types.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/20
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=637
2014-05-20 16:12:28 +02:00
Patch245: 0007-logind-fix-Display-property-of-user-objects.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/21
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=639
2014-05-21 12:27:31 +02:00
Patch246: 0001-hwdb-update.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/21
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=639
2014-05-21 12:27:31 +02:00
Patch247: 0002-hwdb-update.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/21
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=639
2014-05-21 12:27:31 +02:00
Patch248: 0003-hwdb-PCI-include-primary-model-string-in-subsystem-m.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/21
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=639
2014-05-21 12:27:31 +02:00
Patch249: 0004-hwdb-update.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/21
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=639
2014-05-21 12:27:31 +02:00
Patch250: 0005-hwdb-update.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/21
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=639
2014-05-21 12:27:31 +02:00
Patch251: 0001-journal-cleanup-up-error-handling-in-update_catalog.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/21
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=639
2014-05-21 12:27:31 +02:00
Patch252: 0002-journal-properly-detect-language-specified-in-line.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/21
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=639
2014-05-21 12:27:31 +02:00
Patch253: 0003-man-mention-XDG_CONFIG_HOME-in-systemd.unit.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/26
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=642
2014-05-26 17:47:36 +02:00
Patch254: 0001-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/26
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=642
2014-05-26 17:47:36 +02:00
Patch255: 0002-keymap-Asus-EeePC-touchpad-toggle-key.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/26
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=642
2014-05-26 17:47:36 +02:00
Patch256: 0001-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/26
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=642
2014-05-26 17:47:36 +02:00
Patch257: 0002-nspawn-restore-journal-directory-is-empty-check.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/26
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=642
2014-05-26 17:47:36 +02:00
Patch258: 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/26
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=642
2014-05-26 17:47:36 +02:00
Patch259: 0004-socket-properly-handle-if-our-service-vanished-durin.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/27
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=645
2014-05-27 09:24:26 +02:00
Patch260: 0001-Do-not-unescape-unit-names-in-Install-section.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/27
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=645
2014-05-27 09:24:26 +02:00
Patch261: 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
Patch262: 0001-virt-rework-container-detection-logic.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
Patch263: 0002-fsck-include-device-name-in-the-message-about-missin.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
Patch264: 0003-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
Patch265: 0004-util-ignore_file-should-not-allow-files-ending-with.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
Patch266: 0006-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
Patch267: 0007-keyboard-add-Plantronics-.Audio-mute-button.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=656
2014-06-03 18:28:48 +02:00
Patch268: 0001-build-sys-use-glibc-s-xattr-support-instead-of-requi.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/05
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=659
2014-06-05 15:40:35 +02:00
Patch269: 0001-hwdb-fix-case-sensitive-match.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/06
Patch270: 0001-sd-event-restore-correct-timeout-behaviour.patch
# PATCH-FIX-UPSTREAM added at 2014/06/06
Patch271: 0002-bus-make-use-of-sd_bus_try_close-in-exit-on-idle-ser.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=667
2014-06-11 15:37:55 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/11
Patch272: 0001-umount-modernizations.patch
# PATCH-FIX-UPSTREAM added at 2014/06/11
Patch273: 0002-namespace-when-setting-up-an-inaccessible-mount-poin.patch
# PATCH-FIX-UPSTREAM added at 2014/06/11
Patch274: 0003-core-allow-transient-mount-units.patch
# PATCH-FIX-UPSTREAM added at 2014/06/11 - Detect XEN dom0 as well as domU
Patch275: 0004-systemd-detect-virt-only-discover-Xen-domU.patch
# PATCH-FIX-UPSTREAM added at 2014/06/11
Patch276: 0005-backlight-Do-not-clamp-brightness-for-LEDs.patch
# PATCH-FIX-UPSTREAM added at 2014/06/11
Patch277: 0006-log-honour-the-kernel-s-quiet-cmdline-argument.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=677
2014-06-17 17:09:13 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/17
Patch278: 0001-core-fix-invalid-free-in-killall.patch
# PATCH-FIX-UPSTREAM added at 2014/06/17
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch279: 0003-install-fix-invalid-free-in-unit_file_mask.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
# PATCH-FIX-UPSTREAM detect virtualization layers on S390 (bnc#880438)
Patch280: 0001-systemd-detect-virt-detect-s390-virtualization.patch
Backport of 0404c609 (bnc#883565) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=680
2014-06-24 12:02:12 +02:00
# PATCH-FIX-UPSTREAM 0001-core-sysvcompat-network-should-be-equivalent-to-netw.patch arvidjaar@gmail.com -- Ensure legacy services are started after network is available
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch281: 0001-core-sysvcompat-network-should-be-equivalent-to-netw.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch282: 0002-units-add-missing-caps-so-that-GetAddresses-can-work.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch283: 0003-units-order-systemd-tmpfiles-clean.service-after-tim.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch284: 0005-po-add-Greek-translation.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch285: 0006-hwdb-Update-database-of-Bluetooth-company-identifier.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch286: 0007-po-add-German-translation.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch287: 0009-core-clean-up-signal-reset-logic-when-reexec.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch288: 0010-util-treat-fuse.sshfs-as-a-network-filesystem.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch289: 0011-build-sys-add-pthread-flag-for-libsystemd-shared.patch
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/24
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
Patch290: 0012-core-transaction-avoid-misleading-error-message-when.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=687
2014-06-25 19:30:32 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/25
Patch291: 0001-vconsole-also-copy-character-maps-not-just-fonts-fro.patch
# PATCH-FIX-UPSTREAM added at 2014/06/25
Patch292: 0002-core-make-sure-Environment-fields-passed-in-for-tran.patch
# PATCH-FIX-UPSTREAM added at 2014/06/25
Patch293: 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch
# PATCH-FIX-UPSTREAM added at 2014/06/25
Patch294: 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch
# PATCH-FIX-UPSTREAM added at 2014/06/25
Patch295: 0005-man-fix-path-in-crypttab-5.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=689
2014-06-26 08:46:39 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/26
Patch296: 0001-units-order-network-online.target-after-network.targ.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=690
2014-06-26 11:31:57 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/26
Patch297: 0001-core-use-correct-format-string-for-UIDs.patch
# PATCH-FIX-UPSTREAM added at 2014/06/26
Patch298: 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch
# PATCH-FIX-UPSTREAM added at 2014/06/26
Patch299: 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=700
2014-07-01 14:43:04 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/01
Patch300: 0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch
# PATCH-FIX-UPSTREAM added at 2014/07/01
Patch301: 0002-journald-make-MaxFileSec-really-default-to-1month.patch
# PATCH-FIX-UPSTREAM added at 2014/07/01
Patch302: 0003-units-remove-RefuseManualStart-from-units-which-are-.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=703
2014-07-03 15:01:21 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/01
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=700
2014-07-01 14:43:04 +02:00
Patch303: 0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch
# PATCH-FIX-UPSTREAM added at 2014/07/01
Patch304: 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch
# PATCH-FIX-UPSTREAM added at 2014/07/01
Patch305: 0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch
# PATCH-FIX-UPSTREAM added at 2014/07/01
Patch306: 0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=703
2014-07-03 15:01:21 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/03
Patch307: 0001-parse_uid-return-ENXIO-for-1-uids.patch
# PATCH-FIX-UPSTREAM added at 2014/07/03
Patch308: 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch
# PATCH-FIX-UPSTREAM added at 2014/07/03
Patch309: 0003-localed-consider-an-unset-model-as-a-wildcard.patch
# PATCH-FIX-UPSTREAM added at 2014/07/03
Patch310: 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch
# PATCH-FIX-UPSTREAM added at 2014/07/03
Patch311: 0005-bus-close-a-bus-that-failed-to-connect.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=704
2014-07-04 12:28:58 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch312: 0006-hwdb-update.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch313: 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch314: 0001-architecture-Add-tilegx.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch315: 0002-architecture-Add-cris.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch316: 0003-arch-add-crisv32-to-uname-check.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch317: 0004-architecture-remove-cris-from-uname-list.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
- Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=706
2014-07-07 15:05:01 +02:00
Patch318: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=704
2014-07-04 12:28:58 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/04
- Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=706
2014-07-07 15:05:01 +02:00
Patch319: 0002-namespace-fix-uninitialized-memory-access.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=705
2014-07-07 14:54:09 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/07
- Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=706
2014-07-07 15:05:01 +02:00
Patch320: 0001-machine-don-t-return-uninitialized-variable.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=705
2014-07-07 14:54:09 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/07
- Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=706
2014-07-07 15:05:01 +02:00
Patch321: 0002-vconsole-setup-run-setfont-before-loadkeys.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=708
2014-07-08 13:22:39 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/08
Patch322: 0001-util-consider-0x7F-a-control-chracter-which-it-is-DE.patch
# PATCH-FIX-UPSTREAM added at 2014/07/08
Patch323: 0002-util-don-t-consider-tabs-special-in-string_has_cc-an.patch
# PATCH-FIX-UPSTREAM added at 2014/07/08
Patch324: 0003-architecture-add-string-table-entries-for-mips-le-ar.patch
# PATCH-FIX-UPSTREAM added at 2014/07/08
Patch325: 0004-core-Added-support-for-ERRNO-NOTIFY_SOCKET-message-p.patch
# PATCH-FIX-UPSTREAM added at 2014/07/08
Patch326: 0005-service-don-t-accept-negative-ERRNO-notification-mes.patch
# PATCH-FIX-UPSTREAM added at 2014/07/08
Patch327: 0006-systemctl-show-StatusErrno-value-in-systemctl-status.patch
# PATCH-FIX-UPSTREAM added at 2014/07/08
Patch328: 0007-service-flush-status-text-and-errno-values-each-time.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=709
2014-07-09 15:25:39 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/09
Patch329: 0001-journal-compress-return-early-in-uncompress_startswi.patch
# PATCH-FIX-UPSTREAM added at 2014/07/09
Patch330: 0002-journal-compress-improve-xz-compression-performance.patch
# PATCH-FIX-UPSTREAM added at 2014/07/09
Patch331: 0001-logind-allow-switching-to-unused-VTs-via-SwitchTo.patch
# PATCH-FIX-UPSTREAM added at 2014/07/09
Patch332: 0002-hostnamed-add-a-new-chassis-type-for-watches.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=710
2014-07-10 15:37:08 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/10
Patch333: 0001-units-make-ExecStopPost-action-part-of-ExecStart.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=714
2014-07-14 16:10:23 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/14
Patch334: 0001-event-pull-in-sd-event.h-from-event-util.h.patch
# PATCH-FIX-UPSTREAM added at 2014/07/14
Patch335: 0002-util-fix-has-cc-check-and-add-test.patch
# PATCH-FIX-UPSTREAM added at 2014/07/14
Patch336: 0003-sd-event-always-call-epoll_ctl-on-mask-updates-if-ed.patch
# PATCH-FIX-UPSTREAM added at 2014/07/14
Patch337: 0004-fileio-quote-more-shell-characters-in-envfiles.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=717
2014-07-15 09:40:33 +02:00
# PATCH-FIX-SUSE Do a vhangup on all consoles lines (bnc#886599)
Patch338: vhangup-on-all-consoles.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=721
2014-07-17 11:52:31 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/16
Patch339: 0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch
# PATCH-FIX-UPSTREAM added at 2014/07/16
Patch340: 0002-units-serial-getty-.service-use-the-default-RestartS.patch
# PATCH-FIX-UPSTREAM added at 2014/07/17
Patch341: 0001-po-add-Ukrainian-translation.patch
# PATCH-FIX-UPSTREAM added at 2014/07/17
Patch342: 0002-man-document-yearly-and-annually-in-systemd.time-7.patch
# PATCH-FIX-UPSTREAM added at 2014/07/17
Patch343: 0003-core-nicer-message-when-inotify-watches-are-exhauste.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
# PATCH-FIX-UPSTREAM Fix patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch
Patch344: 0001-detect-virt-Fix-Xen-domU-discovery.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
# PATCH-FIX-SUSE Shut up rpmlint warning
Patch345: shut-up-rpmlint-on-var-log-journal.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/21
Patch346: 0002-Be-more-verbose-when-bind-or-listen-fails.patch
# PATCH-FIX-UPSTREAM added at 2014/07/21
Patch347: 0003-Add-quotes-to-warning-message.patch
# PATCH-FIX-UPSTREAM added at 2014/07/21
Patch348: 0004-systemd-return-the-first-error-from-manager_startup.patch
# PATCH-FIX-UPSTREAM added at 2014/07/21
Patch349: 0001-bash-completion-p-option-for-journalctl.patch
# PATCH-FIX-UPSTREAM added at 2014/07/21
Patch350: 0002-journalctl-man-allow-only-between-terms.patch
# PATCH-FIX-UPSTREAM added at 2014/07/21
Patch351: 0003-systemd-use-pager-for-test-and-help.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=724
2014-07-22 14:08:18 +02:00
# PATCH-FIX-SUSE
Patch352: set-and-use-default-logconsole.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/28
Patch353: 0001-bus-proxyd-fix-incorrect-comparison.patch
# PATCH-FIX-UPSTREAM added at 2014/07/28
Patch354: 0002-shell-completion-prevent-mangling-unit-names.patch
# PATCH-FIX-UPSTREAM added at 2014/07/28
Patch355: 0003-Always-check-asprintf-return-code.patch
# PATCH-FIX-UPSTREAM added at 2014/07/28
Patch356: 0004-bash-completion-use-list-unit-files-to-get-all-units.patch
# PATCH-FIX-UPSTREAM added at 2014/07/28
Patch357: 0005-core-only-set-the-kernel-s-timezone-when-the-RTC-run.patch
# PATCH-FIX-UPSTREAM added at 2014/07/28
Patch358: 0006-parse_boolean-require-exact-matches.patch
# PATCH-FIX-UPSTREAM added at 2014/07/28
Patch359: 0007-drop_duplicates-copy-full-BindMount-struct.patch
# PATCH-FIX-UPSTREAM added at 2014/07/28
Patch360: 0008-shell-completion-prevent-mangling-unit-names-bash.patch
# PATCH-FIX-UPSTREAM added at 2014/07/28
Patch361: 0009-journald-always-add-syslog-facility-for-messages-com.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=739
2014-07-30 14:17:21 +02:00
# PATCH-FIX-SUSE For system console do ask passphrases on all devices of the console
Patch362: tty-ask-password-agent-on-console.patch
# PATCH-FIX-UPSTREAM added at 2014/07/30
Patch363: 0001-sysv-order-initscripts-which-provide-network-before-.patch
# PATCH-FIX-UPSTREAM added at 2014/07/30
Patch364: 0002-keymap-Add-microphone-mute-keymap-for-Dell-Latitude.patch
# PATCH-FIX-UPSTREAM added at 2014/07/30
Patch365: 0003-keymap-Annotate-all-micmute-workarounds.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=740
2014-07-30 14:44:17 +02:00
# PATCH-FIX-SUSE Provide the /var/lock/subsys at start (bnc#889357)
Patch366: tomcat6-var-lock-subsys-legacy.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=747
2014-08-01 12:14:21 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/01
Patch367: 0007-hwdb-update.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=752
2014-08-20 17:07:31 +02:00
# PATCH-FIX-SUSE Remove error messages for tab completion for systemctl isolate (bnc#892162)
Patch368: 0001-let-systemctl-completion-ignore-at-names.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=754
2014-08-25 11:47:11 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/22
Patch369: 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch
# PATCH-FIX-UPSTREAM added at 2014/08/22
Patch370: 0002-switch-root-umount-the-old-root-correctly.patch
# PATCH-FIX-UPSTREAM added at 2014/08/22
Patch371: 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch
# PATCH-FIX-UPSTREAM added at 2014/08/22
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=755
2014-08-26 13:39:55 +02:00
Patch372: 0004-login-set_controller-should-fail-if-prepare_vt-fails.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=754
2014-08-25 11:47:11 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/22
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=755
2014-08-26 13:39:55 +02:00
Patch373: 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=754
2014-08-25 11:47:11 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/22
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=755
2014-08-26 13:39:55 +02:00
Patch374: 0006-login-share-VT-signal-handler-between-sessions.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=754
2014-08-25 11:47:11 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/22
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=755
2014-08-26 13:39:55 +02:00
Patch375: 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=754
2014-08-25 11:47:11 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/22
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=755
2014-08-26 13:39:55 +02:00
Patch376: 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=754
2014-08-25 11:47:11 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/22
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=755
2014-08-26 13:39:55 +02:00
Patch377: 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=754
2014-08-25 11:47:11 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/22
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=755
2014-08-26 13:39:55 +02:00
Patch378: 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch
# PATCH-FIX-UPSTREAM added at 2014/08/22
Patch379: 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch
# PATCH-FIX-UPSTREAM added at 2014/08/22
Patch380: 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch
# PATCH-FIX-UPSTREAM added at 2014/08/25
Patch381: 0001-hwdb-keymaps-for-Samsung-900X3E-900X3F.patch
# PATCH-FIX-UPSTREAM added at 2014/08/25
Patch382: 0002-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch
# PATCH-FIX-UPSTREAM added at 2014/08/25
Patch383: 0003-keymap-Fix-HP-Pavillon-DV7.patch
# PATCH-FIX-UPSTREAM added at 2014/08/25
Patch384: 0004-hwdb-update-format-description-and-document-reloadin.patch
# PATCH-FIX-UPSTREAM added at 2014/08/25
Patch385: 0008-hwdb-update.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=757
2014-08-27 14:53:07 +02:00
# PATCH-FIX-SUSE Use RNDADDENTROPY ioctl to load random-seed and to increase entropy count as well (bnc#892096)
Patch386: use-rndaddentropy-ioctl-to-load-random-seed.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=759
2014-08-27 18:02:11 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/27
Patch387: 0001-systemctl-Correct-error-message-printed-when-bus_pro.patch
# PATCH-FIX-UPSTREAM added at 2014/08/27
Patch388: 0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch
# PATCH-FIX-UPSTREAM added at 2014/08/27
Patch389: 0003-keymap-Adjust-for-more-Samsung-900X4-series.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=761
2014-08-28 13:31:51 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/28
Patch390: 0001-login-fix-memory-leak-on-DropController.patch
# PATCH-FIX-UPSTREAM added at 2014/08/28
Patch391: 0002-util-fix-minimal-race-where-we-might-miss-SIGTERMs-w.patch
# PATCH-FIX-UPSTREAM added at 2014/08/28
Patch392: 0003-sd-journal-properly-convert-object-size-on-big-endia.patch
# PATCH-FIX-UPSTREAM added at 2014/08/28
Patch393: 0004-sd-journal-verify-that-object-start-with-the-field-n.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=762
2014-08-29 16:51:38 +02:00
# PATCH-FIX-UPSTREAM added at 2014/08/29
Patch394: 0001-nspawn-fix-network-interface.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=764
2014-09-01 16:28:08 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/01
Patch395: 0001-completion-filter-templates-from-restartable-units.patch
# PATCH-FIX-UPSTREAM added at 2014/09/01
Patch396: 0002-systemd-fix-error-message.patch
# PATCH-FIX-UPSTREAM added at 2014/09/01
Patch397: 0003-Quote-unit-names-in-suggested-systemctl-commandlines.patch
# PATCH-FIX-UPSTREAM added at 2014/09/01
Patch398: 0004-config-parser-fix-mem-leak.patch
# PATCH-FIX-UPSTREAM added at 2014/09/01
Patch399: 0005-login-fix-mem-leak.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=765
2014-09-02 11:15:57 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/02
Patch400: 0001-login-simplify-controller-handling.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=770
2014-09-08 16:49:09 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/05
Patch401: 0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch
# PATCH-FIX-UPSTREAM added at 2014/09/08
Patch402: 0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=771
2014-09-09 16:36:44 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/09
Patch403: 0009-hwdb-update.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=776
2014-09-16 12:25:16 +02:00
# PATCH-FIX-UPSTREAM bnc896664: Allow to override default target without --force
Patch404: 0001-systemctl-allow-to-change-the-default-target-without.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=778
2014-09-16 13:23:31 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch405: 0001-activate-fix-fd-leak-in-do_accept.patch
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch406: 0002-analyze-avoid-a-null-dereference.patch
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch407: 0003-analyze-fix-mem-leak.patch
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch408: 0004-backlight-Avoid-error-when-state-restore-is-disabled.patch
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch409: 0005-bus-avoid-using-m-kdbus-after-freeing-it.patch
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch410: 0006-bus-unref-buscreds-on-failure.patch
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch411: 0007-core-fix-a-potential-mem-leak.patch
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch412: 0008-core-smack-setup-Actually-allow-for-succesfully-load.patch
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch413: 0009-journal-do-not-leak-mmaps-on-OOM.patch
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch414: 0010-manager-use-correct-cleanup-function.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=781
2014-09-18 15:34:20 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/18
Patch415: 0001-core-fix-resource-leak-in-manager_environment_add.patch
# PATCH-FIX-UPSTREAM added at 2014/09/18
Patch416: 0002-util-remove-a-unnecessary-check.patch
# PATCH-FIX-UPSTREAM added at 2014/09/18
Patch417: 0003-udev-event-explicitly-don-t-read-from-invalid-fd.patch
# PATCH-FIX-UPSTREAM added at 2014/09/18
Patch418: 0004-shared-conf-parser.patch
# PATCH-FIX-UPSTREAM added at 2014/09/18
Patch419: 0005-logind-fix-typo.patch
# PATCH-FIX-UPSTREAM added at 2014/09/18
Patch420: 0006-systemctl-fix-resource-leak-CID-1237747.patch
# PATCH-FIX-UPSTREAM added at 2014/09/16
Patch421: 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch
# PATCH-FIX-UPSTREAM added at 2014/09/18
Patch422: 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patch
# PATCH-FIX-UPSTREAM added at 2014/09/18 -- Be aware that the size of the type bool may vary
Patch423: 0009-bus-fix-bus_print_property-to-use-int-for-booleans.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=783
2014-09-19 15:03:02 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/19
Patch424: 0001-journal-Do-not-count-on-the-compiler-initializing-fo.patch
# PATCH-FIX-UPSTREAM added at 2014/09/19
Patch425: 0002-include-fcntl.h-rather-than-sys-fcntl.h.patch
# PATCH-FIX-UPSTREAM added at 2014/09/19
Patch426: 0003-mount-order-options-before-other-arguments-to-mount.patch
# PATCH-FIX-UPSTREAM added at 2014/09/19
Patch427: 0004-shared-wtmp-utmp-don-t-clear-store_wtmp-in-utmp_put_.patch
# PATCH-FIX-UPSTREAM added at 2014/09/19
Patch428: 0005-shared-label.h-add-missing-stdio.h-include.patch
# PATCH-FIX-UPSTREAM added at 2014/09/19
Patch429: 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=784
2014-09-19 15:11:36 +02:00
# PATCH-FIX-SUSE AUDIT-0: Power button press at gdm login should not prompt for credentials (bnc#888612)
Patch430: 0001-bnc888612-logind-polkit-acpi.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=788
2014-09-24 17:07:37 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/24 -- May help that history of the shell is saved
Patch431: 0001-login-pause-devices-before-acknowledging-VT-switches.patch
# PATCH-FIX-UPSTREAM added at 2014/09/24
Patch432: 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch
# PATCH-FIX-UPSTREAM added at 2014/09/24 (bsc#897801)
Patch433: 0001-socket-introduce-SELinuxContextFromNet-option.patch
# PATCH-FIX-UPSTREAM added at 2014/09/24
Patch434: 0002-util-avoid-non-portable-__WORDSIZE.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=790
2014-09-25 11:07:12 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/25
Patch435: 0001-Fix-warning-about-unused-variable-with-SELINUX.patch
# PATCH-FIX-UPSTREAM added at 2014/09/25
Patch436: 0002-bus-remove-unused-check.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=795
2014-09-26 18:12:05 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/26
Patch437: 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=797
2014-10-14 18:30:43 +02:00
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch438: 0001-logind-add-support-for-Triton2-Power-Button.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch439: 0002-logind-add-support-for-TPS65217-Power-Button.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch440: 0001-shutdownd-clean-up-initialization-of-struct.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch441: 0003-bootchart-parse-userinput-with-safe_atoi.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch442: 0004-bootchart-check-return-of-strftime.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch443: 0005-bootchart-Do-not-try-to-access-data-for-non-existing.patch
# PATCH-FIX-UPSTREAM added at 2014/09/30
Patch444: 0001-journalctl-do-not-output-reboot-markers-when-running.patch
# PATCH-FIX-UPSTREAM added at 2014/09/30
Patch445: 0002-udev-hwdb-New-Entry-for-Dell-XPS12-9Q33-keyboard.patch
# PATCH-FIX-UPSTREAM added at 2014/10/02
Patch446: 0001-core-swap-only-make-configured-units-part-of-swap.ta.patch
# PATCH-FIX-UPSTREAM added at 2014/10/02
Patch447: 0009-hwdb-Update-database-of-Bluetooth-company-identifier.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch448: 0001-virt-detect-that-we-are-running-inside-the-docker-co.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch449: 0002-bootchart-use-n-a-if-PRETTY_NAME-is-not-found.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch450: 0003-fileio-label-return-error-when-writing-fails.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch451: 0001-sd-event-don-t-require-a-signal-event-source-to-be-e.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch452: 0004-sd-event-check-the-value-of-received-signal.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch453: 0005-sd-id128-do-stricter-checking-of-random-boot-id.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch454: 0001-keymap-Fix-touchpad-toggle-on-Toshiba-Satellite-P75-.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch455: 0001-units-introduce-network-pre.target-as-place-to-hook-.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch456: 0002-keymap-Fix-touchpad-toggle-key-on-Asus-laptops.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch457: 0003-sd-bus-check-return-value-of-vasprintf.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch458: 0004-core-map-the-rescue-argument-to-rescue.target.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch459: 0005-util-avoid-double-close-of-fd.patch
# PATCH-FIX-UPSTREAM added at 2014/10/13
Patch460: 0001-systemctl-when-mangle-unit-names-for-the-isolate-suf.patch
# PATCH-FIX-UPSTREAM added at 2014/10/14
Patch461: 0001-tmpfiles-compare-return-against-correct-errno.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=801
2014-10-15 14:26:07 +02:00
# PATCH-FIX-UPSTREAM added at 2014/10/15
Patch462: 0001-shell-completion-fix-completion-of-inactive-units.patch
# PATCH-FIX-UPSTREAM added at 2014/10/15
Patch463: 0002-shell-completion-propose-templates-for-disable-re-en.patch
# PATCH-FIX-UPSTREAM added at 2014/10/15
Patch464: 0003-man-we-don-t-have-Wanted-dependency.patch
# PATCH-FIX-UPSTREAM added at 2014/10/15
Patch465: 0004-selinux-fix-potential-double-free-crash-in-child-pro.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=802
2014-10-20 16:13:15 +02:00
# PATCH-FIX-UPSTREAM added at 2014/10/20
Patch466: 0001-systemd-continue-switch-root-even-if-umount-fails.patch
# PATCH-FIX-UPSTREAM added at 2014/10/20
Patch467: 0002-systemd-try-harder-to-bind-to-notify-socket.patch
# PATCH-FIX-SUSE added at 2014/10/15
Patch468: avoid-leaking-socket-descriptors.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=807
2014-10-23 16:19:30 +02:00
# PATCH-FIX-UPSTREAM added at 2014/10/23
Patch469: 0001-strv-add-an-additional-overflow-check-when-enlarging.patch
# PATCH-FIX-UPSTREAM added at 2014/10/23
Patch470: 0002-hwdb-Add-mapping-for-special-keys-on-compaq-ku-0133-.patch
# PATCH-FIX-UPSTREAM added at 2014/10/23
Patch471: 0003-journald-add-CAP_MAC_OVERRIDE-in-journald-for-SMACK-.patch
# PATCH-FIX-UPSTREAM added at 2014/10/23
Patch472: 0004-journal-do-server_vacuum-for-sigusr1.patch
# PATCH-FIX-UPSTREAM added at 2014/10/23
Patch473: 0005-cryptsetup-fix-an-OOM-check.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=808
2014-10-24 15:30:04 +02:00
# PATCH-FIX-UPSTREAM added at 2014/10/24
Patch474: 0002-shutdown-pass-own-argv-to-run-initramfs-shutdown.patch
# PATCH-FIX-SUSE added at 2014/10/24
Patch475: journald-advice-about-use-of-memory.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=809
2014-10-30 15:13:42 +01:00
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch476: 0001-manager-Linux-on-hppa-has-fewer-rtsigs-hence-avoid-u.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch477: 0002-time-also-support-infinity-syntax-in-parse_nsec.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch478: 0003-time-earlier-exit-from-format_timestamp_relative-on-.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch479: 0004-sd-bus-if-we-don-t-manage-to-properly-allocate-the-e.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch480: 0005-journalctl-correct-help-text-for-until.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch481: 0006-calendarspec-fix-typo-in-annually.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch482: 0007-systemctl-do-not-ignore-errors-in-symlink-removal.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch483: 0008-util-introduce-sethostname_idempotent.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch484: 0009-util-fix-copy-paste-error-and-actually-set-the-new-h.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch485: 0010-shutdown-do-final-unmounting-only-if-not-running-ins.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch486: 0011-selinux-make-sure-we-do-not-try-to-print-missing-fie.patch
# PATCH-FIX-UPSTREAM added at 2014/10/28
Patch487: 0012-manager-do-not-print-anything-while-passwords-are-be.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=810
2014-11-03 16:22:08 +01:00
# PATCH-FIX-UPSTREAM added at 2014/10/31
Patch488: 0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch
# PATCH-FIX-UPSTREAM added at 2014/10/31
Patch489: 0002-keymap-Ignore-brightness-keys-on-Dell-Inspiron-1520-.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=811
2014-11-07 13:36:25 +01:00
# PATCH-FIX-SUSE added at 2014/11/05
Patch490: watch_resolv.conf_for_become_changed.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=812
2014-11-10 14:24:58 +01:00
# PATCH-FIX-UPSTREAM added at 2014/11/07
Patch491: 0001-core-don-t-allow-enabling-if-unit-is-masked.patch
# PATCH-FIX-UPSTREAM added at 2014/11/07
Patch492: 0002-snapshot-return-error-when-snapshot-exists.patch
# PATCH-FIX-UPSTREAM added at 2014/11/07
Patch493: 0003-shared-install-avoid-prematurely-rejecting-missing-u.patch
# PATCH-FIX-UPSTREAM added at 2014/11/07
Patch494: 0004-Raise-level-of-Found-dependency.-lines.patch
# PATCH-FIX-UPSTREAM added at 2014/11/07
Patch495: 0005-units-order-sd-journal-flush-after-sd-remount-fs.patch
# PATCH-FIX-UPSTREAM added at 2014/11/07
Patch496: 0006-journald-fix-minor-memory-leak.patch
# PATCH-FIX-UPSTREAM added at 2014/11/07
Patch497: 0007-journald-also-check-journal-file-size-to-deduce-if-i.patch
# PATCH-FIX-UPSTREAM added at 2014/11/07
Patch498: 0008-journald-fix-memory-leak-on-error-path.patch
# PATCH-FIX-UPSTREAM added at 2014/11/07
Patch499: 0009-units-make-systemd-journald.service-Type-notify.patch
# PATCH-FIX-UPSTREAM added at 2014/11/07
Patch500: 0010-hwdb-Update-database-of-Bluetooth-company-identifier.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=815
2014-11-13 14:01:19 +01:00
# PATCH-FIX-UPSTREAM added at 2014/11/10
Patch501: 0001-login-rerun-vconsole-setup-when-switching-from-vgaco.patch
# PATCH-FIX-UPSTREAM added at 2014/11/10
Patch502: 0002-shutdown-fix-arguments-to-run-initramfs-shutdown.patch
# PATCH-FIX-UPSTREAM added at 2014/11/10
Patch503: 0003-utf8-when-looking-at-the-next-unichar-honour-the-siz.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=817
2014-11-18 11:11:22 +01:00
# PATCH-FIX-UPSTREAM added at 2014/11/18
Patch504: 0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch
# PATCH-FIX-UPSTREAM added at 2014/11/18
Patch505: 0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=818
2014-11-18 13:46:46 +01:00
# PATCH-FIX-UPSTREAM added at 2014/11/18
Patch506: 0001-systemctl-let-list-units-unit-files-honour-type.patch
# PATCH-FIX-UPSTREAM added at 2014/11/18
Patch507: 0002-systemctl-obey-state-in-list-unit-files.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=822
2014-11-20 15:00:20 +01:00
# PATCH-FIX-UPSTREAM added at 2014/11/20
Patch508: 0001-systemd-logind.service-set-Type-notify.patch
# PATCH-FIX-UPSTREAM added at 2014/11/20
Patch509: 0002-core-watchdog-bus-properties-cannot-be-both-writable.patch
# PATCH-FIX-UPSTREAM added at 2014/11/20
Patch510: 0003-sd-bus-refuse-properties-that-claim-to-be-both-writa.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=582
2014-04-08 10:00:36 +02:00
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=592
2014-04-10 12:19:46 +02:00
# UDEV PATCHES
# ============
# NOTE: all udev patches start with 1XXX-*.patch, do not use anything else.
# Udev patches mean: patches that affect udev code, src/{udev,libudev}
# nothing else, even if the patch might affect indirectly udev, as long
# as it's not changing the code of udev and libudev, then is not a udev
# patch. Further patches which add and/or changes udev rules.
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=517
2014-02-14 17:08:20 +01:00
# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
Patch1001: 1001-re-enable-by_path-links-for-ata-devices.patch
# PATCH-FIX-OPENSUSE 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
Patch1002: 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
# PATCH-FIX-OPENSUSE 1003-udev-netlink-null-rules.patch
Patch1003: 1003-udev-netlink-null-rules.patch
# PATCH-FIX-OPENSUSE 1005-create-default-links-for-primary-cd_dvd-drive.patch
Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=536
2014-03-04 11:58:29 +01:00
# PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch
Patch1006: 1006-udev-always-rename-network.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=517
2014-02-14 17:08:20 +01:00
# PATCH-FIX-OPENSUSE 1007-physical-hotplug-cpu-and-memory.patch
Patch1007: 1007-physical-hotplug-cpu-and-memory.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=560
2014-03-14 12:10:20 +01:00
# PATCH-FIX-OPENSUSE 1008-add-msft-compability-rules.patch -- for code base <= 1310
Patch1008: 1008-add-msft-compability-rules.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
# PATCH-FIX-USTREAM added at 2014/03/03
Patch1009: 1009-cdrom_id-use-the-old-MMC-fallback.patch
# PATCH-FIX-SUSE increase result size for programs (bnc#867840)
Patch1010: 1010-udev-increase-result-size-for-programs.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=592
2014-04-10 12:19:46 +02:00
# PATCH-FIX-SUSE skip btrfs check if devices are not ready (bnc#872929)
Patch1011: 1011-64-btrfs.rules-skip-btrfs-check-if-devices-are-not-r.patch
# PATCH-FIX-SUSE skip persistent device link creation on mp device (bnc#872929)
Patch1012: 1012-Skip-persistent-device-link-creation-on-multipath-de.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=610
2014-04-28 11:54:18 +02:00
# PATCH-FIX-SUSE Do not use runtime PM for some IBM consoles (bnc#868931)
- Do not use runtime PM for some IBM consoles (bnc#868931) 1013-no-runtime-PM-for-IBM-consoles.patch - Do not use runtime PM for some IBM consoles (bnc#868931) 1013-no-runtime-PM-for-IBM-consoles.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=609
2014-04-28 11:21:34 +02:00
Patch1013: 1013-no-runtime-PM-for-IBM-consoles.patch
- Drop upstream-net_id-changes.patch and replace them with the correct patches from upstream and their commits: add: 1014-udev-update-net_id-comments.patch add: 1015-udev-persistent-naming-we-cannot-use-virtio-numbers-.patch - Drop upstream-net_id-changes.patch and replace them with the correct patches from upstream and their commits: add: 1014-udev-update-net_id-comments.patch add: 1015-udev-persistent-naming-we-cannot-use-virtio-numbers-.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=623
2014-05-12 14:30:16 +02:00
# PATCH-FIX-USTREAM 1014-udev-update-net_id-comments.patch
Patch1014: 1014-udev-update-net_id-comments.patch
# PATCH-FIX-USTREAM 1015-udev-persistent-naming-we-cannot-use-virtio-numbers-.patch
Patch1015: 1015-udev-persistent-naming-we-cannot-use-virtio-numbers-.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=634
2014-05-20 13:17:58 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/12
Patch1016: 1016-udev-warn-when-name_to_handle_at-is-not-implemented.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch1017: 1017-udev-serialize-synchronize-block-device-event-handli.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch1018: 1018-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch1019: 1019-udev-avoid-use-of-uninitialized-err.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/05/26
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=643
2014-05-26 18:34:59 +02:00
Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch
- Re-add persistent rules to have a backup option if predictable rules are disabled at boot time with 'net.ifnames=0' option. add: 1021-udev-re-add-persistent-net-rules.patch - udev: remove seqnum API and all assumptions about seqnums add: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - Re-add persistent rules to have a backup option if predictable rules are disabled at boot time with 'net.ifnames=0' option. add: 1021-udev-re-add-persistent-net-rules.patch - udev: remove seqnum API and all assumptions about seqnums add: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=649
2014-05-30 13:13:04 +02:00
# PATCH-FIX-SUSE 1021-udev-re-add-persistent-net-rules.patch
Patch1021: 1021-udev-re-add-persistent-net-rules.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
Readd patch 1022 and add 1037-udev-exclude-cd-dvd-from-block-device.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=678
2014-06-18 15:10:45 +02:00
Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
# PATCH-FIX-UPSTREAM added at 2014/06/03
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
Patch1024: 1024-udev-always-close-lock-file-descriptor.patch
- Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch - Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=662
2014-06-09 10:41:53 +02:00
# PATCH-FIX-UPSTREAM 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch
Patch1025: 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch
# PATCH-FIX-UPSTREAM 1026-udevd-inotify-modernizations.patch
Patch1026: 1026-udevd-inotify-modernizations.patch
# PATCH-FIX-UPSTREAM 1027-udev-synthesize-change-events-for-partitions-when-to.patch
Patch1027: 1027-udev-synthesize-change-events-for-partitions-when-to.patch
# PATCH-FIX-UPSTREAM 1028-udev-link-config-fix-mem-leak.patch
Patch1028: 1028-udev-link-config-fix-mem-leak.patch
# PATCH-FIX-UPSTREAM 1029-udev-try-first-re-reading-the-partition-table.patch
Patch1029: 1029-udev-try-first-re-reading-the-partition-table.patch
# PATCH-FIX-UPSTREAM 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch
Patch1030: 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch
# PATCH-FIX-UPSTREAM 1031-udev-make-sure-we-always-get-change-for-the-disk.patch
Patch1031: 1031-udev-make-sure-we-always-get-change-for-the-disk.patch
# PATCH-FIX-UPSTREAM 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch
Patch1032: 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch
- Add upstream patches 1033-udev-really-exclude-device-mapper-from-block-device.patch 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch - Add upstream patches 1033-udev-really-exclude-device-mapper-from-block-device.patch 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=666
2014-06-10 22:00:15 +02:00
# PATCH-FIX-UPSTREAM 1033-udev-really-exclude-device-mapper-from-block-device.patch
Patch1033: 1033-udev-really-exclude-device-mapper-from-block-device.patch
# PATCH-FIX-UPSTREAM 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch
Patch1034: 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=673
2014-06-12 14:30:27 +02:00
# PATCH-FIX-SUSE 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch
Patch1035: 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch
- rules: disable usage of dev_id in persistent rules (bnc#882714). add: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch - Disable patch (bnc#882714). 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - rules: disable usage of dev_id in persistent rules (bnc#882714). add: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch - Disable patch (bnc#882714). 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=674
2014-06-17 14:09:34 +02:00
# PATCH-FIX-SUSE 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch
Patch1036: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch
Readd patch 1022 and add 1037-udev-exclude-cd-dvd-from-block-device.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=678
2014-06-18 15:10:45 +02:00
# PATCH-FIX-SUSE See bnc#882714 comment #51
Patch1037: 1037-udev-exclude-cd-dvd-from-block-device.patch
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
# PATCH-FIX-UPSTREAM 1038-udev-fix-invalid-free-in-enable_name_policy.patch
Patch1038: 1038-udev-fix-invalid-free-in-enable_name_policy.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=685
2014-06-25 19:08:46 +02:00
# PATCH-FIX-UPSTREAM 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
- rules: re-enable dev_id conditionally in persistent rules (bnc#884403 and bnc#882714). Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - Temporary disable patch 1022 (bnc#884271 and bnc#882714). - rules: re-enable dev_id conditionally in persistent rules (bnc#884403 and bnc#882714). Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - Temporary disable patch 1022 (bnc#884271 and bnc#882714). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=688
2014-06-25 20:17:16 +02:00
# PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714)
Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=693
2014-06-27 14:59:41 +02:00
# PATCH-FIX-UPSTREAM 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch
Patch1041: 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=695
2014-07-01 10:57:46 +02:00
# PATCH-FIX-UPSTREAM 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch
Patch1042: 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch
# PATCH-FIX-UPSTREAM 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch
Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=700
2014-07-01 14:43:04 +02:00
# PATCH-FIX-UPSTREAM 1044-rules-update-qemu-hid-rules.patch
Patch1044: 1044-rules-update-qemu-hid-rules.patch
# PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch
Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch
- Fix duplicated rules when having layer3 interfaces (bnc#882714). Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch - Fix duplicated rules when having layer3 interfaces (bnc#882714). Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=701
2014-07-02 20:09:12 +02:00
# PATCH-FIX-SUSE 1046-fix-duplicated-rules-with-layer3-interfaces.patch (bnc#882714)
Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=703
2014-07-03 15:01:21 +02:00
# PATCH-FIX-UPSTREAM added at 2014/07/03
Patch1047: 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch
- Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=706
2014-07-07 15:05:01 +02:00
# PATCH-FIX-UPSTREAM 1048-udev-net_setup_link-add-a-bit-more-logging.patch
Patch1048: 1048-udev-net_setup_link-add-a-bit-more-logging.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=708
2014-07-08 13:22:39 +02:00
# PATCH-FIX-UPSTREAM 1049-udev-link_config-ignore-errors-due-to-missing-MAC-ad.patch
Patch1049: 1049-udev-link_config-ignore-errors-due-to-missing-MAC-ad.patch
- Only rename SRIOV-VF devices if device name start with eth (bnc#885232). Add 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch - Only rename SRIOV-VF devices if device name start with eth (bnc#885232). Add 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=718
2014-07-15 14:33:30 +02:00
# PATCH-FIX-SUSE 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch (bnc#885232)
Patch1050: 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch
- Check if NAME key has a value before going thru the rule (bnc#885232). Add 1051-check-if-NAME-has-a-value.patch - Check if NAME key has a value before going thru the rule (bnc#885232). Add 1051-check-if-NAME-has-a-value.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=720
2014-07-17 08:35:02 +02:00
# PATCH-FIX-SUSE 1051-check-if-NAME-has-a-value.patch (bnc#885232)
Patch1051: 1051-check-if-NAME-has-a-value.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=721
2014-07-17 11:52:31 +02:00
# PATCH-FIX-UPSTREAM 1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
Patch1052: 1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
- Enable better checks in write_net_rules to skip adding duplicated entries in the generate rules (bnc#888178). Add 1053-better-checks-in-write_net_rules.patch - Enable better checks in write_net_rules to skip adding duplicated entries in the generate rules (bnc#888178). Add 1053-better-checks-in-write_net_rules.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=726
2014-07-23 11:23:13 +02:00
# PATCH-FIX-SUSE 1053-better-checks-in-write_net_rules.patch (bnc#888178)
Patch1053: 1053-better-checks-in-write_net_rules.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
# PATCH-FIX-SUSE 0001-udev-exclude-MD-from-block-device-ownership-event-lo.patch
Patch1054: 1054-udev-exclude-MD-from-block-device-ownership-event-lo.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=739
2014-07-30 14:17:21 +02:00
# PATCH-FIX-SUSE 1055-let-9719859c07aa13539ed2cd4b31972cd30f678543-apply.patch
Patch1055: 1055-let-9719859c07aa13539ed2cd4b31972cd30f678543-apply.patch
# PATCH-FIX-UPSTREAM 1056-udevd-add-event-timeout-commandline-option.patch
Patch1056: 1056-udevd-add-event-timeout-commandline-option.patch
# PATCH-FIX-UPSTREAM 1057-udev-unify-event-timeout-handling.patch
Patch1057: 1057-udev-unify-event-timeout-handling.patch
# PATCH-FIX-UPSTREAM 1058-udev-unify-event-timeout-handling.patch
Patch1058: 1058-udev-unify-event-timeout-handling.patch
# PATCH-FIX-UPSTREAM 1059-udev-fixup-commit-dd5eddd28a74a49607a8fffcaf960040db.patch
Patch1059: 1059-udev-fixup-commit-dd5eddd28a74a49607a8fffcaf960040db.patch
- Rename: udev-use-device-mapper-target-name-for-btrfs-device-ready.patch to 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.patch - Rename: udev-use-device-mapper-target-name-for-btrfs-device-ready.patch to 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=745
2014-07-31 09:57:12 +02:00
# PATCH-FIX-SUSE 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.patch
Patch1060: 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=747
2014-08-01 12:14:21 +02:00
# PATCH-FIX-UPSTREAM 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch
Patch1061: 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch
- Set default permissions for GenWQE device nodes to 0666 (bnc#890977). Add 1062-rules-set-default-permissions-for-GenWQE-devices.patch - Set default permissions for GenWQE device nodes to 0666 (bnc#890977). Add 1062-rules-set-default-permissions-for-GenWQE-devices.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=749
2014-08-08 14:55:43 +02:00
# PATCH-FIX-SUSE 1062-rules-set-default-permissions-for-GenWQE-devices.patch (bnc#890977)
Patch1062: 1062-rules-set-default-permissions-for-GenWQE-devices.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=754
2014-08-25 11:47:11 +02:00
# PATCH-FIX-UPSTREAM 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=810
2014-11-03 16:22:08 +01:00
Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=760
2014-08-28 12:09:25 +02:00
# PATCH-FIX-UPSTREAM 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch
Patch1064: 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=764
2014-09-01 16:28:08 +02:00
# PATCH-FIX-UPSTREAM 1065-udev-bump-event-timeout-to-60-seconds.patch
Patch1065: 1065-udev-bump-event-timeout-to-60-seconds.patch
- udev: add option to generate old 'buggy' serials (bnc#886852) Add 1066-udev-add-compatibility-links-for-truncated-by-id-links.patch - udev: add option to generate old 'buggy' serials (bnc#886852) Add 1066-udev-add-compatibility-links-for-truncated-by-id-links.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=766
2014-09-02 14:58:23 +02:00
# PATCH-FIX-SUSE 1066-udev-add-compatibility-links-for-truncated-by-id-links.patch (bnc#886852)
Patch1066: 1066-udev-add-compatibility-links-for-truncated-by-id-links.patch
- udev: always resolve correctly database names on 'change' event (bnc#864745). Add 1067-udev-always-resolve-correctly-database-names-on-chan.patch - udev: always resolve correctly database names on 'change' event (bnc#864745). Add 1067-udev-always-resolve-correctly-database-names-on-chan.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=773
2014-09-13 23:29:17 +02:00
# PATCH-FIX-UPSTREAM 1067-udev-always-resolve-correctly-database-names-on-chan.patch (bnc#864745)
Patch1067: 1067-udev-always-resolve-correctly-database-names-on-chan.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=774
2014-09-16 11:14:28 +02:00
# PATCH-FIX-UPSTREAM 1068-udev-net_setup_link-export-the-.link-filename-applie.patch
Patch1068: 1068-udev-net_setup_link-export-the-.link-filename-applie.patch
# PATCH-FIX-UPSTREAM 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch
Patch1069: 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch
# PATCH-FIX-UPSTREAM 1070-rules-net-setup-link-remove-stray-linebreak.patch
Patch1070: 1070-rules-net-setup-link-remove-stray-linebreak.patch
# PATCH-FIX-UPSTREAM 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch
Patch1071: 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch
# PATCH-FIX-UPSTREAM 1072-udev-netif_rename-don-t-log-to-kmsg.patch
Patch1072: 1072-udev-netif_rename-don-t-log-to-kmsg.patch
# PATCH-FIX-UPSTREAM 1073-udev-drop-print_kmsg.patch
Patch1073: 1073-udev-drop-print_kmsg.patch
# PATCH-FIX-UPSTREAM 1074-udev-fix-copy-paste-error-in-log-message.patch
Patch1074: 1074-udev-fix-copy-paste-error-in-log-message.patch
# PATCH-FIX-UPSTREAM 1075-udev-timeout-increase-timeout.patch
Patch1075: 1075-udev-timeout-increase-timeout.patch
# PATCH-FIX-UPSTREAM 1076-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch
Patch1076: 1076-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=775
2014-09-16 11:34:24 +02:00
# PATCH-FIX-UPSTREAM 1077-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch
Patch1077: 1077-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=778
2014-09-16 13:23:31 +02:00
# PATCH-FIX-UPSTREAM 1078-udev-remove-userspace-firmware-loading-support.patch
Patch1078: 1078-udev-remove-userspace-firmware-loading-support.patch
# PATCH-FIX-UPSTREAM 1079-udev-remove-userspace-firmware-loading-support.patch
Patch1079: 1079-udev-remove-userspace-firmware-loading-support.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=783
2014-09-19 15:03:02 +02:00
# PATCH-FIX-UPSTREAM 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch
Patch1080: 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch
# PATCH-FIX-UPSTREAM 1081-udevd-check-return-of-various-functions.patch
Patch1081: 1081-udevd-check-return-of-various-functions.patch
# PATCH-FIX-UPSTREAM 1082-udevadm-hwdb-check-return-value-of-fseeko.patch
Patch1082: 1082-udevadm-hwdb-check-return-value-of-fseeko.patch
# PATCH-FIX-UPSTREAM 1083-udev-node-warn-if-chmod-chown-fails.patch
Patch1083: 1083-udev-node-warn-if-chmod-chown-fails.patch
# PATCH-FIX-UPSTREAM 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch
Patch1084: 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch
# PATCH-FIX-UPSTREAM 1085-udev-fix-typos.patch
Patch1085: 1085-udev-fix-typos.patch
# PATCH-FIX-UPSTREAM 1085-udevd-don-t-fail-if-run-udev-exists.patch
Patch1086: 1086-udevd-don-t-fail-if-run-udev-exists.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=806
2014-10-22 16:18:20 +02:00
# PATCH-FIX-SUSE 1087-infinit-timeout-for-kmod-loaded-modules.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=793
2014-09-25 16:09:53 +02:00
Patch1087: 1087-infinit-timeout-for-kmod-loaded-modules.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=806
2014-10-22 16:18:20 +02:00
# PATCH-FIX-SUSE 1088-drop-renaming-of-virtual-interfaces-in-guest.patch (bnc#898432)
- Drop renaming virtual interfaces in a guest (bnc#898432). Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch - Drop renaming virtual interfaces in a guest (bnc#898432). Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=794
2014-09-26 11:37:41 +02:00
Patch1088: 1088-drop-renaming-of-virtual-interfaces-in-guest.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=806
2014-10-22 16:18:20 +02:00
# PATCH-FIX-UPSTREAM 1089-fix-cgroup-device-controller.patch
Patch1089: 1089-fix-cgroup-device-controller.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=810
2014-11-03 16:22:08 +01:00
# PATCH-FIX-UPSTREAM 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch
Patch1090: 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch
# PATCH-FIX-UPSTREAM 1091-udev-path_id-update-comments.patch
Patch1091: 1091-udev-path_id-update-comments.patch
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=812
2014-11-10 14:24:58 +01:00
# PATCH-FIX-UPSTREAM 1092-libudev-do-not-accept-invalid-log-levels.patch
Patch1092: 1092-libudev-do-not-accept-invalid-log-levels.patch
# PATCH-FIX-UPSTREAM 1093-udev-Fix-parsing-of-udev.event-timeout-kernel-parame.patch
Patch1093: 1093-udev-Fix-parsing-of-udev.event-timeout-kernel-parame.patch
# PATCH-FIX-UPSTREAM 1094-udev-avoid-magic-constants-in-kernel-cmdline-parsers.patch
Patch1094: 1094-udev-avoid-magic-constants-in-kernel-cmdline-parsers.patch
- Create rule to set I/O scheduler to deadline if device attribute 'rotational' equals 0, usually SSDs (bnc#904517). Add 1095-set-ssd-disk-to-use-deadline-scheduler.patch - Create rule to set I/O scheduler to deadline if device attribute 'rotational' equals 0, usually SSDs (bnc#904517). Add 1095-set-ssd-disk-to-use-deadline-scheduler.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=813
2014-11-13 11:20:35 +01:00
# PATCH-FIX-SUSE 1095-set-ssd-disk-to-use-deadline-scheduler.patch (bnc#904517)
Patch1095: 1095-set-ssd-disk-to-use-deadline-scheduler.patch
- New root symlink rule generator Add 1096-new-udev-root-symlink-generator.patch - Remove write_dev_root_rule and systemd-udev-root-symlink - New root symlink rule generator Add 1096-new-udev-root-symlink-generator.patch - Remove write_dev_root_rule and systemd-udev-root-symlink OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=816
2014-11-14 13:19:40 +01:00
# PATCH-FIX-SUSE 1096-new-udev-root-symlink-generator.patch
Patch1096: 1096-new-udev-root-symlink-generator.patch
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%description
update OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=87
2010-11-16 12:37:22 +01:00
Systemd is a system and service manager, compatible with SysV and LSB
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
init scripts for Linux. systemd provides aggressive parallelization
capabilities, uses socket and D-Bus activation for starting services,
offers on-demand starting of daemons, keeps track of processes using
Linux cgroups, supports snapshotting and restoring of the system state,
maintains mount and automount points and implements an elaborate
transactional dependency-based service control logic. It can work as a
drop-in replacement for sysvinit.
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
- split bash-completion support into its own package, no need for sles_version OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=509
2014-02-08 11:46:51 +01:00
%package bash-completion
Summary: Bash completion support for systemd
License: LGPL-2.1+
Group: System/Base
Requires: bash
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=511
2014-02-09 19:45:14 +01:00
%if %{with bash_completion}
- split bash-completion support into its own package, no need for sles_version OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=509
2014-02-08 11:46:51 +01:00
Requires: bash-completion
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=511
2014-02-09 19:45:14 +01:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=545
2014-03-11 12:12:39 +01:00
BuildArch: noarch
- split bash-completion support into its own package, no need for sles_version OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=509
2014-02-08 11:46:51 +01:00
%description bash-completion
Some systemd commands offer bash completion, but it's an optional dependency.
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
%package devel
Summary: Development headers for systemd
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=303
2012-11-02 15:16:22 +01:00
License: LGPL-2.1+
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
Group: Development/Libraries/C and C++
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
Requires: %{name} = %{version}
Reduce build time dependencies OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=398
2013-06-19 09:04:23 +02:00
Requires: systemd-rpm-macros
- add some more conflicts to make bootstrap work OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=369
2013-04-23 14:55:16 +02:00
%if 0%{?bootstrap}
Conflicts: systemd-devel
%endif
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
%description devel
Development headers and auxiliary files for developing applications for systemd.
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%package sysvinit
Summary: System V init tools
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=303
2012-11-02 15:16:22 +01:00
License: LGPL-2.1+
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
Group: System/Base
- Use RPM macros instead of $RPM_FOO variables - Don't require %{version}-%{release} of the base package, %{version} is sufficient OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=155
2011-06-15 12:09:00 +02:00
Requires: %{name} = %{version}
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
Provides: sbin_init
- do not list specific sbin_init providers OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=208
2011-10-11 13:07:20 +02:00
Conflicts: otherproviders(sbin_init)
- make sure updaters get in the /sbin/init from here - the sub package of the split package will decide which init wins in update case OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=211
2011-10-11 15:58:26 +02:00
Provides: sysvinit:/sbin/init
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%description sysvinit
Drop-in replacement of System V init tools.
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%package -n %{udevpkgname}
Summary: A rule-based device node and kernel event manager
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=303
2012-11-02 15:16:22 +01:00
License: GPL-2.0
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Group: System/Kernel
Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
PreReq: /bin/rm
PreReq: %insserv_prereq
PreReq: %fillup_prereq
PreReq: /usr/bin/sg_inq
Requires(pre): /usr/bin/stat
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/bin/getent
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
Requires(post): lib%{udevpkgname}%{udev_major}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=599
2014-04-16 13:59:56 +02:00
Requires(post): sed
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
Requires(post): /usr/bin/systemctl
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=597
2014-04-16 12:17:08 +02:00
%if %{defined regenerate_initrd_post}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=599
2014-04-16 13:59:56 +02:00
Requires(post): coreutils
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
Requires(post): /usr/bin/stat
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=599
2014-04-16 13:59:56 +02:00
Requires(postun): coreutils
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=600
2014-04-16 14:07:20 +02:00
Requires(posttrans): suse-module-tools
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=601
2014-04-16 15:27:37 +02:00
Requires(posttrans): /sbin/mkinitrd
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=599
2014-04-16 13:59:56 +02:00
%else
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=601
2014-04-16 15:27:37 +02:00
Requires(post): /sbin/mkinitrd
Requires(postun): /sbin/mkinitrd
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=597
2014-04-16 12:17:08 +02:00
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Conflicts: systemd < 39
Conflicts: aaa_base < 11.5
Conflicts: filesystem < 11.5
Conflicts: mkinitrd < 2.7.0
Conflicts: util-linux < 2.16
Conflicts: ConsoleKit < 0.4.1
Requires: filesystem
%if 0%{?bootstrap}
Provides: udev = %{version}
- add some more conflicts to make bootstrap work OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=369
2013-04-23 14:55:16 +02:00
Conflicts: libudev%{udev_major}
- Do not provide %{release} for systemd-analyze - Add more conflicts to -mini packages - Disable Predictable Network interface names until it has been reviewed by network team, with /usr/lib/tmpfiles.d/network.conf. - Don't package /usr/lib/firmware/update (not used) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=367
2013-04-22 16:35:32 +02:00
Conflicts: udev
- add more requires to this-is-only-for-build-envs to avoid problems in kiwi configs OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=514
2014-02-11 11:26:19 +01:00
# avoid kiwi picking it for bootstrap
Requires: this-is-only-for-build-envs
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
%description -n %{udevpkgname}
Udev creates and removes device nodes in /dev for devices discovered or
removed from the system. It receives events via kernel netlink messages
and dispatches them according to rules in /lib/udev/rules.d/. Matching
rules may name a device node, create additional symlinks to the node,
call tools to initialize a device, or load needed kernel modules.
%package -n lib%{udevpkgname}%{udev_major}
Summary: Dynamic library to access udev device information
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=303
2012-11-02 15:16:22 +01:00
License: LGPL-2.1+
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Group: System/Libraries
Requires: %{udevpkgname} >= %{version}-%{release}
- Add fix-devname-prefix.patch: fix modules.devname path, it isn't in /usr. - Move post script to fix symlinks in /etc/systemd/system to a trigger to run it after old systemd is uninstalled. - Add fix-debugshell.patch: use /bin/bash if sushell isn't installed (bnc#789052). - Add handle-root-uses-lang.patch: handle ROOT_USES_LANG=ctype (bnc#792182). - Ensure libudev1 and libudev-mini1 conflicts. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=317
2012-12-05 19:07:07 +01:00
%if 0%{?bootstrap}
Conflicts: libudev%{udev_major}
- add some more conflicts to make bootstrap work OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=369
2013-04-23 14:55:16 +02:00
Conflicts: kiwi
- add more requires to this-is-only-for-build-envs to avoid problems in kiwi configs OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=514
2014-02-11 11:26:19 +01:00
# avoid kiwi picking it for bootstrap
Requires: this-is-only-for-build-envs
- Add fix-devname-prefix.patch: fix modules.devname path, it isn't in /usr. - Move post script to fix symlinks in /etc/systemd/system to a trigger to run it after old systemd is uninstalled. - Add fix-debugshell.patch: use /bin/bash if sushell isn't installed (bnc#789052). - Add handle-root-uses-lang.patch: handle ROOT_USES_LANG=ctype (bnc#792182). - Ensure libudev1 and libudev-mini1 conflicts. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=317
2012-12-05 19:07:07 +01:00
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%description -n lib%{udevpkgname}%{udev_major}
This package contains the dynamic library libudev, which provides
access to udev device information
%package -n lib%{udevpkgname}-devel
Summary: Development files for libudev
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=303
2012-11-02 15:16:22 +01:00
License: LGPL-2.1+
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Group: Development/Libraries/Other
Requires: lib%{udevpkgname}%{udev_major} = %{version}-%{release}
%if 0%{?bootstrap}
Provides: libudev-devel = %{version}
- add conflicts between udev-mini and udev-mini-devel to libudev1 - add conflicts between udev-mini and udev-mini-devel to libudev1 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=320
2012-12-10 15:22:55 +01:00
Conflicts: libudev%{udev_major} = %{version}
- Do not provide %{release} for systemd-analyze - Add more conflicts to -mini packages - Disable Predictable Network interface names until it has been reviewed by network team, with /usr/lib/tmpfiles.d/network.conf. - Don't package /usr/lib/firmware/update (not used) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=367
2013-04-22 16:35:32 +02:00
Conflicts: libudev-devel
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
%description -n lib%{udevpkgname}-devel
This package contains the development files for the library libudev, a
dynamic library, which provides access to udev device information.
%if ! 0%{?bootstrap}
%package -n libgudev-1_0-0
Summary: GObject library, to access udev device information
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=303
2012-11-02 15:16:22 +01:00
License: LGPL-2.1+
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Group: System/Libraries
Requires: lib%{udevpkgname}%{udev_major} = %{version}-%{release}
%description -n libgudev-1_0-0
This package contains the GObject library libgudev, which provides
access to udev device information.
%package -n typelib-1_0-GUdev-1_0
Summary: GObject library, to access udev device information -- Introspection bindings
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=303
2012-11-02 15:16:22 +01:00
License: LGPL-2.1+
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Group: System/Libraries
%description -n typelib-1_0-GUdev-1_0
This package provides the GObject Introspection bindings for libgudev, which
provides access to udev device information.
%package -n libgudev-1_0-devel
Summary: Devel package for libgudev
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=303
2012-11-02 15:16:22 +01:00
License: LGPL-2.1+
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
Group: Development/Libraries/Other
Requires: glib2-devel
Requires: libgudev-1_0-0 = %{version}-%{release}
Requires: libudev-devel = %{version}-%{release}
Requires: typelib-1_0-GUdev-1_0 = %{version}-%{release}
%description -n libgudev-1_0-devel
This is the devel package for the GObject library libgudev, which
provides GObject access to udev device information.
- adding a package systemd-logger that blocks syslog implementations from installation to make an installation that only uses the journal - adding a package systemd-logger that blocks syslog implementations from installation to make an installation that only uses the journal OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=309
2012-11-06 15:52:17 +01:00
%package logger
Summary: Journal only logging
License: LGPL-2.1+
Group: System/Base
Provides: syslog
Provides: sysvinit(syslog)
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
Requires(pre): /usr/bin/getent
Requires(pre): /usr/sbin/groupadd
Requires(post): /usr/bin/getent
Requires(post): /usr/bin/setfacl
Requires(post): /usr/bin/systemctl
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
Requires(post): permissions
- adding a package systemd-logger that blocks syslog implementations from installation to make an installation that only uses the journal - adding a package systemd-logger that blocks syslog implementations from installation to make an installation that only uses the journal OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=309
2012-11-06 15:52:17 +01:00
Conflicts: otherproviders(syslog)
%description logger
This package marks the installation to not use syslog but only the journal.
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%package -n nss-myhostname
Summary: Plugin for local system host name resolution
License: LGPL-2.1+
Group: System/Libraries
%description -n nss-myhostname
nss-myhostname is a plugin for the GNU Name Service Switch (NSS)
functionality of the GNU C Library (glibc) providing host name
resolution for the locally configured system hostname as returned by
gethostname(2). Various software relies on an always resolvable local
host name. When using dynamic hostnames this is usually achieved by
patching /etc/hosts at the same time as changing the host name. This
however is not ideal since it requires a writable /etc file system and
is fragile because the file might be edited by the administrator at
the same time. nss-myhostname simply returns all locally
configured public IP addresses, or -- if none are configured --
the IPv4 address 127.0.0.2 (wich is on the local loopback) and the
IPv6 address ::1 (which is the local host) for whatever system
hostname is configured locally. Patching /etc/hosts is thus no
longer necessary.
Note that nss-myhostname only provides a workaround for broken
software. If nss-myhostname is trigged by an application a message
is logged to /var/log/messages. Please check whether that's worth
a bug report then.
This package marks the installation to not use syslog but only the journal.
- Move systemd-journal-gateway to subpackage to lower dependencies in default install. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=417
2013-07-25 17:40:51 +02:00
%package journal-gateway
Summary: Gateway for serving journal events over the network using HTTP
License: LGPL-2.1+
Group: System/Base
Requires: %{name} = %{version}-%{release}
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%description journal-gateway
systemd-journal-gatewayd serves journal events over the network using HTTP.
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%prep
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%setup -q -n systemd-%{version}
We talked about using %patch, but in that case I would need a tarball of systemd in rpm-macros package which depends on xz which is part of many circles. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=399
2013-06-19 13:05:44 +02:00
echo "Checking whether upstream rpm macros changed..."
[ -z "`diff -Naru "%{S:10}" src/core/macros.systemd.in`" ] || exit 1
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
# only needed for bootstrap
%if 0%{?bootstrap}
cp %{SOURCE7} m4/
%endif
- Add udev MSFT compability rules (bnc#805059). add: 1007-add-msft-compability-rules.patch - Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). - Clean-up spec file, put udev patches after systemd patches. - Rebase patches so they would apply nicely. - Add udev MSFT compability rules (bnc#805059). add: 1007-add-msft-compability-rules.patch - Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). - Clean-up spec file, put udev patches after systemd patches. - Rebase patches so they would apply nicely. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=391
2013-06-11 13:22:32 +02:00
# systemd patches
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%patch0 -p1
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=110
2011-02-07 18:03:14 +01:00
%patch1 -p1
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=768
2014-09-04 15:13:54 +02:00
%if 0%{?suse_version} <= 1310
- Add tty1.patch: ensure passphrase are handled before starting gettty on tty1. - Add inittab generator, creating default.target at startup based on /etc/inittab value. - No longer try to create /etc/systemd/system/default.target at initial package install (bnc#707418) - Fix configuration path used for systemd user manager. - Ensure pam-config output is no display in install script. - Remove buildrequires on vala, no longer needed. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=183
2011-08-24 17:35:41 +02:00
%patch8 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=768
2014-09-04 15:13:54 +02:00
%endif
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%patch9 -p1
%patch12 -p1
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
%patch13 -p0
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=210
2011-10-11 15:15:07 +02:00
%patch15 -p1
- Shadow single sysv service, it was breaking runlevel 1. - Add modules_on_boot.patch to handle /etc/sysconfig/kernel MODULES_ON_BOOT variable (bnc#721662). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=215
2011-10-12 15:43:49 +02:00
%patch16 -p1
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%patch17 -p1
%patch18 -p1
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
%patch19 -p0
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%patch20 -p1
%patch21 -p1
- Remove storage-after-cryptsetup.service, add storage-after-cryptsetup.patch instead to prevent dependency cycle (bnc#722539). - Add delay-fsck-cryptsetup-after-md-lvm-dmraid.patch: ensure fsck/cryptsetup is run after lvm/md/dmraid have landed (bnc#724912). - Add cron-tty-pam.patch: Fix cron filling logs (bnc#731358). - Add do_not_warn_pidfile.patch: Fix PID warning in logs (bnc#732912). - Add mount-swap-log.patch: Ensure swap and mount output is redirected to default log target (rhb#750032). - Add color-on-boot.patch: ensure colored status are displayed at boot time. - Update modules_on_boot.patch to fix bnc#732041. - Replace private_tmp_crash.patch with log_on_close.patch, better upstream fix for bnc#699829 and fix bnc#731719. - Update vconsole patch to fix memleaks and crash (bnc#734527). - Add handle-racy-daemon.patch: fix warnings with sendmail (bnc#732912). - Add new-lsb-headers.patch: support PIDFile: and X-Systemd-RemainAfterExit: header in initscript (bnc#727771). - Update bootsplash services to not start if vga= is missing from cmdline (bnc#727771) - Add lock-opensuse.patch: disable /var/lock/{subsys,lockdev} and change default permissions on /var/lock (bnc#733523). - Add garbage_collect_units: ensure error units are correctly garbage collected (rhb#680122). - Add crypt-loop-file.patch: add support for crypt file loop (bnc#730496). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=228
2011-12-09 15:44:59 +01:00
%patch22 -p1
%patch23 -p1
%patch24 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=574
2014-03-25 18:29:50 +01:00
%patch25 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
# check if this is still needed, or can be derived from fbdev uaccess rule
# http://lists.freedesktop.org/archives/systemd-devel/2012-November/007561.html
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=526
2014-02-28 18:31:08 +01:00
%patch27 -p1
- apply-ACL-for-nvidia-uvm-device-node.patch: set ACL on nvidia-uvm device (bnc#879767). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=652
2014-06-03 16:52:37 +02:00
%patch28 -p1
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%patch37 -p1
- Fix regression in the default for tmp auto-deletion (systemd-tmp-safe-defaults.patch, FATE#314974). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=364
2013-04-19 16:00:28 +02:00
%patch39 -p1
- Add sysctl-handle-boot-sysctl.conf-kernel_release.patch: ensure /boot/sysctl.conf-<kernel_release> is handled (bnc#809420). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=382
2013-05-17 17:16:28 +02:00
%patch40 -p1
- Do no ship defaults for sysctl, they should be part of aaa_base (currently in procps). - Add hostname-setup-shortname.patch: ensure shortname is set as hostname (bnc#820213). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=385
2013-05-27 11:58:29 +02:00
%patch41 -p1
- version 207, distribution specific changes follow, for overall release notes see NEWS. - Fixed: * Failed at step PAM spawning /usr/lib/systemd/systemd: Operation not permitted * Fix shutdown hang "a stop job is running for Session 1 of user root" that was reported in opensuse-factory list. - systemd-sysctl no longer reads /etc/sysctl.conf however backward compatbility is to be provides by a symlink created at %post. - version 207, distribution specific changes follow, for overall release notes see NEWS. - Fixed: * Failed at step PAM spawning /usr/lib/systemd/systemd: Operation not permitted * Fix shutdown hang "a stop job is running for Session 1 of user root" that was reported in opensuse-factory list. - systemd-sysctl no longer reads /etc/sysctl.conf however backward compatbility is to be provides by a symlink created at %post. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=429
2013-09-13 09:25:15 +02:00
%patch42 -p1
emergency.service failed to start because sulogin is in /usr/sbin now. Add use-usr-sbin-sulogin-for-emergency-service.patch to fix the path in unit file. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=415
2013-07-14 15:56:23 +02:00
%patch46 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=547
2014-03-12 15:31:57 +01:00
%patch47 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=493
2014-01-23 13:56:59 +01:00
%patch84 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=497
2014-01-28 13:57:54 +01:00
%patch86 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=501
2014-01-30 13:35:04 +01:00
%patch90 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=505
2014-02-05 12:33:45 +01:00
%patch91 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=517
2014-02-14 17:08:20 +01:00
%patch93 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=528
2014-02-28 18:55:27 +01:00
%patch114 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%if 0%{?suse_version} <= 1310
%patch117 -p1
%endif
%patch119 -p1
%patch120 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=528
2014-02-28 18:55:27 +01:00
%patch121 -p0
%patch122 -p0
%patch123 -p0
%patch124 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%patch125 -p0
%patch126 -p0
%patch127 -p0
%patch128 -p0
%patch129 -p0
%patch130 -p0
%patch131 -p0
%patch132 -p0
%patch133 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
%patch134 -p0
%patch135 -p0
%patch136 -p0
%patch137 -p0
%patch138 -p0
%patch139 -p0
%patch140 -p0
%patch141 -p0
%patch142 -p0
%patch143 -p0
%patch144 -p0
%patch145 -p0
%patch146 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=543
2014-03-11 12:03:08 +01:00
%patch147 -p0
%patch148 -p0
%patch149 -p0
%patch150 -p0
%patch151 -p0
%patch152 -p0
%patch153 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=565
2014-03-19 13:11:12 +01:00
%patch154 -p0
%patch155 -p0
%patch157 -p0
%patch158 -p0
%patch159 -p0
%patch160 -p0
%patch161 -p0
%patch162 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=580
2014-03-28 13:59:18 +01:00
%patch163 -p0
%patch164 -p0
%patch165 -p0
%patch166 -p0
%patch167 -p0
%patch168 -p0
%patch169 -p0
%patch170 -p0
%patch171 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=591
2014-04-10 11:17:32 +02:00
%patch172 -p0
%patch173 -p0
%patch174 -p0
%patch175 -p0
%patch176 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
%patch177 -p1
%patch178 -p1
%patch179 -p1
%patch180 -p1
%patch181 -p1
%patch182 -p1
%patch183 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=811
2014-11-07 13:36:25 +01:00
%if 0%{?has_tmpkeep}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
%patch184 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=811
2014-11-07 13:36:25 +01:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
%patch185 -p1
%patch186 -p1
%patch187 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=591
2014-04-10 11:17:32 +02:00
%patch188 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
%patch189 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=591
2014-04-10 11:17:32 +02:00
%patch190 -p1
%patch191 -p1
%patch192 -p1
%patch193 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
%patch194 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=669
2014-06-11 16:11:11 +02:00
%patch196 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=594
2014-04-14 17:09:11 +02:00
%patch195 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=595
2014-04-15 13:25:54 +02:00
%patch197 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=603
2014-04-17 15:36:28 +02:00
%patch198 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=610
2014-04-28 11:54:18 +02:00
%patch199 -p0
%patch200 -p0
%patch201 -p0
%patch202 -p0
%patch203 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=614
2014-05-02 12:15:38 +02:00
%patch204 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=616
2014-05-05 16:06:21 +02:00
%patch206 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=619
2014-05-07 11:34:13 +02:00
%patch207 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=621
2014-05-07 12:43:30 +02:00
%patch208 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=624
2014-05-13 10:48:13 +02:00
%patch209 -p0
%patch211 -p0
%patch212 -p0
%patch213 -p0
%patch214 -p0
%patch215 -p0
%patch216 -p0
%patch217 -p0
%patch218 -p0
%patch219 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=626
2014-05-14 09:40:46 +02:00
%patch220 -p0
%patch221 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=627
2014-05-16 13:48:04 +02:00
%patch222 -p0
%patch223 -p0
%patch224 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=633
2014-05-19 15:33:36 +02:00
%patch225 -p0
%patch226 -p0
%patch227 -p0
%patch228 -p0
%patch229 -p0
%patch230 -p0
%patch231 -p0
%patch232 -p0
%patch233 -p0
%patch234 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=635
2014-05-20 13:32:38 +02:00
%patch235 -p0
%patch236 -p0
%patch237 -p0
%patch238 -p0
%patch239 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=636
2014-05-20 14:13:39 +02:00
%patch240 -p0
%patch241 -p0
%patch242 -p0
%patch243 -p0
%patch244 -p0
%patch245 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=639
2014-05-21 12:27:31 +02:00
%patch246 -p0
%patch247 -p0
%patch248 -p0
%patch249 -p0
%patch250 -p0
%patch251 -p0
%patch252 -p0
%patch253 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=642
2014-05-26 17:47:36 +02:00
%patch254 -p0
%patch255 -p0
%patch256 -p0
%patch257 -p0
%patch258 -p0
%patch259 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=645
2014-05-27 09:24:26 +02:00
%patch260 -p0
%patch261 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
%patch262 -p0
%patch263 -p0
%patch264 -p0
%patch265 -p0
%patch266 -p0
%patch267 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=656
2014-06-03 18:28:48 +02:00
%patch268 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=659
2014-06-05 15:40:35 +02:00
%patch269 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
%patch270 -p0
%patch271 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=667
2014-06-11 15:37:55 +02:00
%patch272 -p0
%patch273 -p0
%patch274 -p0
%patch275 -p0
%patch276 -p0
%patch277 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=677
2014-06-17 17:09:13 +02:00
%patch278 -p0
%patch279 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
%patch280 -p0
Add 0001-detect-s390-virt.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=679
2014-06-18 15:37:26 +02:00
%patch281 -p1
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
%patch282 -p0
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
%patch283 -p0
%patch284 -p0
%patch285 -p0
%patch286 -p0
%patch287 -p0
%patch288 -p0
%patch289 -p0
%patch290 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=687
2014-06-25 19:30:32 +02:00
%patch291 -p0
%patch292 -p0
%patch293 -p0
%patch294 -p0
%patch295 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=689
2014-06-26 08:46:39 +02:00
%patch296 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=690
2014-06-26 11:31:57 +02:00
%patch297 -p0
%patch298 -p0
%patch299 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=700
2014-07-01 14:43:04 +02:00
%patch300 -p0
%patch301 -p0
%patch302 -p0
%patch303 -p0
%patch304 -p0
%patch305 -p0
%patch306 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=703
2014-07-03 15:01:21 +02:00
%patch307 -p0
%patch308 -p0
%patch309 -p0
%patch310 -p0
%patch311 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=704
2014-07-04 12:28:58 +02:00
%patch312 -p0
%patch313 -p0
%patch314 -p0
%patch315 -p0
%patch316 -p0
%patch317 -p0
%patch318 -p0
%patch319 -p0
%patch320 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=705
2014-07-07 14:54:09 +02:00
%patch321 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=708
2014-07-08 13:22:39 +02:00
%patch322 -p0
%patch323 -p0
%patch324 -p0
%patch325 -p0
%patch326 -p0
%patch327 -p0
%patch328 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=709
2014-07-09 15:25:39 +02:00
%patch329 -p0
%patch330 -p0
%patch331 -p0
%patch332 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=710
2014-07-10 15:37:08 +02:00
%patch333 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=714
2014-07-14 16:10:23 +02:00
%patch334 -p0
%patch335 -p0
%patch336 -p0
%patch337 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=717
2014-07-15 09:40:33 +02:00
%patch338 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=721
2014-07-17 11:52:31 +02:00
%patch339 -p0
%patch340 -p0
%patch341 -p0
%patch342 -p0
%patch343 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
%patch344 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
%patch345 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
%patch346 -p0
%patch347 -p0
%patch348 -p0
%patch349 -p0
%patch350 -p0
%patch351 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=724
2014-07-22 14:08:18 +02:00
%patch352 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
%patch353 -p0
%patch354 -p0
%patch355 -p0
%patch356 -p0
%patch357 -p0
%patch358 -p0
%patch359 -p0
%patch360 -p0
%patch361 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=739
2014-07-30 14:17:21 +02:00
%patch362 -p1
%patch363 -p0
%patch364 -p0
%patch365 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=740
2014-07-30 14:44:17 +02:00
%patch366 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=747
2014-08-01 12:14:21 +02:00
%patch367 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=752
2014-08-20 17:07:31 +02:00
%patch368 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=754
2014-08-25 11:47:11 +02:00
%patch369 -p0
%patch370 -p0
%patch371 -p0
%patch372 -p0
%patch373 -p0
%patch374 -p0
%patch375 -p0
%patch376 -p0
%patch377 -p0
%patch378 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=755
2014-08-26 13:39:55 +02:00
%patch379 -p0
%patch380 -p0
%patch381 -p0
%patch382 -p0
%patch383 -p0
%patch384 -p0
%patch385 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=757
2014-08-27 14:53:07 +02:00
%patch386 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=759
2014-08-27 18:02:11 +02:00
%patch387 -p0
%patch388 -p0
%patch389 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=761
2014-08-28 13:31:51 +02:00
%patch390 -p0
%patch391 -p0
%patch392 -p0
%patch393 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=762
2014-08-29 16:51:38 +02:00
%patch394 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=764
2014-09-01 16:28:08 +02:00
%patch395 -p0
%patch396 -p0
%patch397 -p0
%patch398 -p0
%patch399 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=765
2014-09-02 11:15:57 +02:00
%patch400 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=770
2014-09-08 16:49:09 +02:00
%patch401 -p0
%patch402 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=771
2014-09-09 16:36:44 +02:00
%patch403 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=776
2014-09-16 12:25:16 +02:00
%patch404 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=778
2014-09-16 13:23:31 +02:00
%patch405 -p0
%patch406 -p0
%patch407 -p0
%patch408 -p0
%patch409 -p0
%patch410 -p0
%patch411 -p0
%patch412 -p0
%patch413 -p0
%patch414 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=780
2014-09-18 11:20:14 +02:00
%patch415 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=781
2014-09-18 15:34:20 +02:00
%patch416 -p0
%patch417 -p0
%patch418 -p0
%patch419 -p0
%patch420 -p0
%patch421 -p0
%patch422 -p0
%patch423 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=783
2014-09-19 15:03:02 +02:00
%patch424 -p0
%patch425 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=792
2014-09-25 16:06:16 +02:00
%patch426 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=783
2014-09-19 15:03:02 +02:00
%patch427 -p0
%patch428 -p0
%patch429 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=784
2014-09-19 15:11:36 +02:00
%patch430 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=788
2014-09-24 17:07:37 +02:00
%patch431 -p0
%patch432 -p0
%patch433 -p0
%patch434 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=790
2014-09-25 11:07:12 +02:00
%patch435 -p0
%patch436 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=795
2014-09-26 18:12:05 +02:00
%patch437 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=797
2014-10-14 18:30:43 +02:00
%patch438 -p0
%patch439 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=799
2014-10-15 10:49:33 +02:00
%ifarch %arm
%patch38 -p1
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=797
2014-10-14 18:30:43 +02:00
%patch440 -p0
%patch441 -p0
%patch442 -p0
%patch443 -p0
%patch444 -p0
%patch445 -p0
%patch446 -p0
%patch447 -p0
%patch448 -p0
%patch449 -p0
%patch450 -p0
%patch451 -p0
%patch452 -p0
%patch453 -p0
%patch454 -p0
%patch455 -p0
%patch456 -p0
%patch457 -p0
%patch458 -p0
%patch459 -p0
%patch460 -p0
%patch461 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=801
2014-10-15 14:26:07 +02:00
%patch462 -p0
%patch463 -p0
%patch464 -p0
%patch465 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=802
2014-10-20 16:13:15 +02:00
%patch466 -p0
%patch467 -p0
%patch468 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=807
2014-10-23 16:19:30 +02:00
%patch469 -p0
%patch470 -p0
%patch471 -p0
%patch472 -p0
%patch473 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=808
2014-10-24 15:30:04 +02:00
%patch474 -p0
%patch475 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=809
2014-10-30 15:13:42 +01:00
%patch476 -p0
%patch477 -p0
%patch478 -p0
%patch479 -p0
%patch480 -p0
%patch481 -p0
%patch482 -p0
%patch483 -p0
%patch484 -p0
%patch485 -p0
%patch486 -p0
%patch487 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=810
2014-11-03 16:22:08 +01:00
%patch488 -p0
%patch489 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=811
2014-11-07 13:36:25 +01:00
%patch490 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=812
2014-11-10 14:24:58 +01:00
%patch491 -p0
%patch492 -p0
%patch493 -p0
%patch494 -p0
%patch495 -p0
%patch496 -p0
%patch497 -p0
%patch498 -p0
%patch499 -p0
%patch500 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=815
2014-11-13 14:01:19 +01:00
%patch501 -p0
%patch502 -p0
%patch503 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=817
2014-11-18 11:11:22 +01:00
%patch504 -p0
%patch505 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=818
2014-11-18 13:46:46 +01:00
%patch506 -p0
%patch507 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=822
2014-11-20 15:00:20 +01:00
%patch508 -p0
%patch509 -p0
%patch510 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
- Add udev MSFT compability rules (bnc#805059). add: 1007-add-msft-compability-rules.patch - Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). - Clean-up spec file, put udev patches after systemd patches. - Rebase patches so they would apply nicely. - Add udev MSFT compability rules (bnc#805059). add: 1007-add-msft-compability-rules.patch - Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). - Clean-up spec file, put udev patches after systemd patches. - Rebase patches so they would apply nicely. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=391
2013-06-11 13:22:32 +02:00
# udev patches
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
%patch1005 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=536
2014-03-04 11:58:29 +01:00
%patch1006 -p1
- Add udev MSFT compability rules (bnc#805059). add: 1007-add-msft-compability-rules.patch - Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). - Clean-up spec file, put udev patches after systemd patches. - Rebase patches so they would apply nicely. - Add udev MSFT compability rules (bnc#805059). add: 1007-add-msft-compability-rules.patch - Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). - Clean-up spec file, put udev patches after systemd patches. - Rebase patches so they would apply nicely. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=391
2013-06-11 13:22:32 +02:00
%patch1007 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=560
2014-03-14 12:10:20 +01:00
%if 0%{?suse_version} <= 1310
%patch1008 -p1
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=588
2014-04-10 11:06:04 +02:00
%patch1009 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=587
2014-04-10 11:02:21 +02:00
%patch1010 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=592
2014-04-10 12:19:46 +02:00
%patch1011 -p1
%patch1012 -p1
- Do not use runtime PM for some IBM consoles (bnc#868931) 1013-no-runtime-PM-for-IBM-consoles.patch - Do not use runtime PM for some IBM consoles (bnc#868931) 1013-no-runtime-PM-for-IBM-consoles.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=609
2014-04-28 11:21:34 +02:00
%patch1013 -p1
- Drop upstream-net_id-changes.patch and replace them with the correct patches from upstream and their commits: add: 1014-udev-update-net_id-comments.patch add: 1015-udev-persistent-naming-we-cannot-use-virtio-numbers-.patch - Drop upstream-net_id-changes.patch and replace them with the correct patches from upstream and their commits: add: 1014-udev-update-net_id-comments.patch add: 1015-udev-persistent-naming-we-cannot-use-virtio-numbers-.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=623
2014-05-12 14:30:16 +02:00
%patch1014 -p1
%patch1015 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=634
2014-05-20 13:17:58 +02:00
%patch1016 -p0
%patch1017 -p0
%patch1018 -p0
%patch1019 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=643
2014-05-26 18:34:59 +02:00
%patch1020 -p0
- Re-add persistent rules to have a backup option if predictable rules are disabled at boot time with 'net.ifnames=0' option. add: 1021-udev-re-add-persistent-net-rules.patch - udev: remove seqnum API and all assumptions about seqnums add: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - Re-add persistent rules to have a backup option if predictable rules are disabled at boot time with 'net.ifnames=0' option. add: 1021-udev-re-add-persistent-net-rules.patch - udev: remove seqnum API and all assumptions about seqnums add: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=649
2014-05-30 13:13:04 +02:00
%patch1021 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=684
2014-06-25 16:14:00 +02:00
%if %{with udevsettle}
Readd patch 1022 and add 1037-udev-exclude-cd-dvd-from-block-device.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=678
2014-06-18 15:10:45 +02:00
%patch1022 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=684
2014-06-25 16:14:00 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=651
2014-06-03 16:25:18 +02:00
%patch1023 -p0
%patch1024 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%if %{with blkrrpart}
- Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch - Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=662
2014-06-09 10:41:53 +02:00
%patch1025 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%endif
- Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch - Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=662
2014-06-09 10:41:53 +02:00
%patch1026 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%if %{with blkrrpart}
- Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch - Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=662
2014-06-09 10:41:53 +02:00
%patch1027 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%endif
- Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch - Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=662
2014-06-09 10:41:53 +02:00
%patch1028 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%if %{with blkrrpart}
- Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch - Add upstream patches 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch 1026-udevd-inotify-modernizations.patch 1027-udev-synthesize-change-events-for-partitions-when-to.patch 1028-udev-link-config-fix-mem-leak.patch 1029-udev-try-first-re-reading-the-partition-table.patch 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch 1031-udev-make-sure-we-always-get-change-for-the-disk.patch 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=662
2014-06-09 10:41:53 +02:00
%patch1029 -p1
%patch1030 -p1
%patch1031 -p1
%patch1032 -p1
- Add upstream patches 1033-udev-really-exclude-device-mapper-from-block-device.patch 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch - Add upstream patches 1033-udev-really-exclude-device-mapper-from-block-device.patch 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=666
2014-06-10 22:00:15 +02:00
%patch1033 -p1
%patch1034 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=673
2014-06-12 14:30:27 +02:00
%patch1035 -p1
- rules: disable usage of dev_id in persistent rules (bnc#882714). add: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch - Disable patch (bnc#882714). 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - rules: disable usage of dev_id in persistent rules (bnc#882714). add: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch - Disable patch (bnc#882714). 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=674
2014-06-17 14:09:34 +02:00
%patch1036 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%if %{with blkrrpart}
Readd patch 1022 and add 1037-udev-exclude-cd-dvd-from-block-device.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=678
2014-06-18 15:10:45 +02:00
%patch1037 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%endif
- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682
2014-06-24 13:57:06 +02:00
%patch1038 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=686
2014-06-25 19:12:37 +02:00
%if %{with udevsettle}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=685
2014-06-25 19:08:46 +02:00
%patch1039 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=686
2014-06-25 19:12:37 +02:00
%endif
- rules: re-enable dev_id conditionally in persistent rules (bnc#884403 and bnc#882714). Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - Temporary disable patch 1022 (bnc#884271 and bnc#882714). - rules: re-enable dev_id conditionally in persistent rules (bnc#884403 and bnc#882714). Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - Temporary disable patch 1022 (bnc#884271 and bnc#882714). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=688
2014-06-25 20:17:16 +02:00
%patch1040 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=693
2014-06-27 14:59:41 +02:00
%if %{with udevsettle}
%patch1041 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=695
2014-07-01 10:57:46 +02:00
%patch1042 -p0
%patch1043 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=693
2014-06-27 14:59:41 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=700
2014-07-01 14:43:04 +02:00
%patch1044 -p0
%patch1045 -p0
- Fix duplicated rules when having layer3 interfaces (bnc#882714). Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch - Fix duplicated rules when having layer3 interfaces (bnc#882714). Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=701
2014-07-02 20:09:12 +02:00
%patch1046 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=703
2014-07-03 15:01:21 +02:00
%patch1047 -p0
- Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=706
2014-07-07 15:05:01 +02:00
%patch1048 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=708
2014-07-08 13:22:39 +02:00
%patch1049 -p0
- Only rename SRIOV-VF devices if device name start with eth (bnc#885232). Add 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch - Only rename SRIOV-VF devices if device name start with eth (bnc#885232). Add 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=718
2014-07-15 14:33:30 +02:00
%patch1050 -p1
- Check if NAME key has a value before going thru the rule (bnc#885232). Add 1051-check-if-NAME-has-a-value.patch - Check if NAME key has a value before going thru the rule (bnc#885232). Add 1051-check-if-NAME-has-a-value.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=720
2014-07-17 08:35:02 +02:00
%patch1051 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=721
2014-07-17 11:52:31 +02:00
%patch1052 -p0
- Enable better checks in write_net_rules to skip adding duplicated entries in the generate rules (bnc#888178). Add 1053-better-checks-in-write_net_rules.patch - Enable better checks in write_net_rules to skip adding duplicated entries in the generate rules (bnc#888178). Add 1053-better-checks-in-write_net_rules.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=726
2014-07-23 11:23:13 +02:00
%patch1053 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%if %{with blkrrpart}
%patch1054 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=739
2014-07-30 14:17:21 +02:00
%else
%patch1055 -p1
%endif
%patch1056 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=744
2014-07-31 09:48:41 +02:00
%if %{with udevsettle}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=739
2014-07-30 14:17:21 +02:00
%patch1057 -p0
%else
%patch1058 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=731
2014-07-25 12:06:14 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=739
2014-07-30 14:17:21 +02:00
%patch1059 -p0
- udev: use device mapper target name for btrfs device ready (bnc#888215). - Add udev-use-device-mapper-target-name-for-btrfs-device-ready.patch - udev: use device mapper target name for btrfs device ready (bnc#888215). - Add udev-use-device-mapper-target-name-for-btrfs-device-ready.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=743
2014-07-31 08:53:04 +02:00
%patch1060 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=747
2014-08-01 12:14:21 +02:00
%patch1061 -p0
- Set default permissions for GenWQE device nodes to 0666 (bnc#890977). Add 1062-rules-set-default-permissions-for-GenWQE-devices.patch - Set default permissions for GenWQE device nodes to 0666 (bnc#890977). Add 1062-rules-set-default-permissions-for-GenWQE-devices.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=749
2014-08-08 14:55:43 +02:00
%patch1062 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=810
2014-11-03 16:22:08 +01:00
%if %{with parentpathid}
%patch1063 -p0
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=760
2014-08-28 12:09:25 +02:00
%patch1064 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=764
2014-09-01 16:28:08 +02:00
%patch1065 -p0
- udev: add option to generate old 'buggy' serials (bnc#886852) Add 1066-udev-add-compatibility-links-for-truncated-by-id-links.patch - udev: add option to generate old 'buggy' serials (bnc#886852) Add 1066-udev-add-compatibility-links-for-truncated-by-id-links.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=766
2014-09-02 14:58:23 +02:00
%patch1066 -p1
- udev: always resolve correctly database names on 'change' event (bnc#864745). Add 1067-udev-always-resolve-correctly-database-names-on-chan.patch - udev: always resolve correctly database names on 'change' event (bnc#864745). Add 1067-udev-always-resolve-correctly-database-names-on-chan.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=773
2014-09-13 23:29:17 +02:00
%patch1067 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=774
2014-09-16 11:14:28 +02:00
%patch1068 -p0
%patch1069 -p0
%patch1070 -p0
%patch1071 -p0
%patch1072 -p0
%patch1073 -p0
%patch1074 -p0
%patch1075 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=775
2014-09-16 11:34:24 +02:00
%if %{with udevsettle}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=774
2014-09-16 11:14:28 +02:00
%patch1076 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=775
2014-09-16 11:34:24 +02:00
%else
%patch1077 -p0
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=778
2014-09-16 13:23:31 +02:00
%if 0%{?suse_version} > 1310
%if %{with udevsettle}
%patch1079 -p1
%else
%patch1078 -p1
%endif
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=783
2014-09-19 15:03:02 +02:00
%patch1080 -p0
%patch1081 -p0
%patch1082 -p0
%patch1083 -p0
%patch1084 -p0
%patch1085 -p0
%patch1086 -p0
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=793
2014-09-25 16:09:53 +02:00
%patch1087 -p0
- Drop renaming virtual interfaces in a guest (bnc#898432). Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch - Drop renaming virtual interfaces in a guest (bnc#898432). Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=794
2014-09-26 11:37:41 +02:00
%patch1088 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=806
2014-10-22 16:18:20 +02:00
%patch1089 -p1
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=810
2014-11-03 16:22:08 +01:00
%if %{with parentpathid}
%patch1090 -p0
%patch1091 -p0
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=812
2014-11-10 14:24:58 +01:00
%patch1092 -p0
%patch1093 -p0
%patch1094 -p0
- Create rule to set I/O scheduler to deadline if device attribute 'rotational' equals 0, usually SSDs (bnc#904517). Add 1095-set-ssd-disk-to-use-deadline-scheduler.patch - Create rule to set I/O scheduler to deadline if device attribute 'rotational' equals 0, usually SSDs (bnc#904517). Add 1095-set-ssd-disk-to-use-deadline-scheduler.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=813
2014-11-13 11:20:35 +01:00
%patch1095 -p1
- New root symlink rule generator Add 1096-new-udev-root-symlink-generator.patch - Remove write_dev_root_rule and systemd-udev-root-symlink - New root symlink rule generator Add 1096-new-udev-root-symlink-generator.patch - Remove write_dev_root_rule and systemd-udev-root-symlink OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=816
2014-11-14 13:19:40 +01:00
%patch1096 -p1
- Add udev MSFT compability rules (bnc#805059). add: 1007-add-msft-compability-rules.patch - Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). - Clean-up spec file, put udev patches after systemd patches. - Rebase patches so they would apply nicely. - Add udev MSFT compability rules (bnc#805059). add: 1007-add-msft-compability-rules.patch - Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). - Clean-up spec file, put udev patches after systemd patches. - Rebase patches so they would apply nicely. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=391
2013-06-11 13:22:32 +02:00
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=755
2014-08-26 13:39:55 +02:00
# remove patch backups
find -name '*.orig' -exec rm -f '{}' \+
- Update use-usr-sbin-sulogin-for-emergency-service.patch to apply to all services using sulogin and remove generated files from upstream tarball (bnc#841398). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=445
2013-09-27 22:05:07 +02:00
# ensure generate files are removed
rm -f units/emergency.service
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=659
2014-06-05 15:40:35 +02:00
# disable "-l" option for fsck if it does not support new locking scheme
# compare with commit c343be283b7152554bac0c02493a4e1759c163f7
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=665
2014-06-10 18:23:39 +02:00
PATH=${PATH}:/sbin:/usr/sbin
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=664
2014-06-10 17:30:38 +02:00
PATH_FSCK=$(type -p fsck)
if grep -q /run/fsck/%%s\\.lock $PATH_FSCK
then
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
echo Found new $PATH_FSCK that is allow private locking
else
echo Found old $PATH_FSCK that is disable flock for this one
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=664
2014-06-10 17:30:38 +02:00
sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c
fi
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=659
2014-06-05 15:40:35 +02:00
Also support 13.1 for now OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=683
2014-06-24 14:05:21 +02:00
%if 0%{?suse_version} <= 1310
#
# Older versions like oS 13.1 do not distinguish between
# network.target and network-online.target
#
for f in src/core/service.c src/insserv-generator/insserv-generator.c
do
sed -ri '/"network",.*SPECIAL_NETWORK_ONLINE_TARGET,/{ s/SPECIAL_NETWORK_ONLINE_TARGET/SPECIAL_NETWORK_TARGET/}' $f
done
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=724
2014-07-22 14:08:18 +02:00
#
# In combination with Patch352 set-and-use-default-logconsole.patch
# Ensure that journald log on tty10
#
%ifarch %ix86 x86_64 x32
sed -ri 's:#TTYPath=/dev/console:#TTYPath=/dev/tty10:' src/journal/journald.conf
%endif
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%build
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=663
2014-06-10 13:19:53 +02:00
cflags ()
{
local flag=$1; shift
local var=$1; shift
local gold
test -n "${flag}" -a -n "${var}" || return
case "${!var}" in
*${flag}*) return
esac
if type ld.gold > /dev/null 2>&1 ; then
gold=-Wl,-fuse-ld=gold
fi
set -o noclobber
case "$flag" in
-Wl,*)
if echo 'int main () { return 0; }' | \
${CC:-gcc} -Werror $gold $flag -o /dev/null -xc - > /dev/null 2>&1 ; then
eval $var=\${$var:+\$$var\ }$flag
fi
rm -f ldtest.c
;;
*)
if ${CC:-gcc} -Werror $gold $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
eval $var=\${$var:+\$$var\ }$flag
fi
if ${CXX:-g++} -Werror $gold $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then
eval $var=\${$var:+\$$var\ }$flag
fi
esac
set +o noclobber
}
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=110
2011-02-07 18:03:14 +01:00
autoreconf -fiv
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
# prevent pre-generated and distributed files from re-building
- Create getty@tty1.service to restore traditional SUSE behavior of not clearing tty1. (bnc#804158) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=350
2013-02-18 17:15:49 +01:00
find . -name "*.[1-8]" -exec touch '{}' '+';
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=663
2014-06-10 13:19:53 +02:00
export V=e
export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
export LDFLAGS
%if 0%{?suse_version} == 1315
CFLAGS="$CFLAGS -DNET_IFNAMES=1"
%else
CFLAGS="$CFLAGS -DNET_IFNAMES=0"
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=667
2014-06-11 15:37:55 +02:00
for rules in 75-persistent-net-generator 76-net-sriov-names
do
sed -ri '/^ENV\{net.ifnames\}=="1", GOTO="[^"]*"$/{ s/=="1"/!="0"/ }' src/udev/rule_generator/${rules}.rules
done
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=663
2014-06-10 13:19:53 +02:00
%endif
cflags -pipe CFLAGS
cflags -Wl,-O2 LDFLAGS
cflags -Wl,--hash-size=8599 LDFLAGS
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
# keep split-usr until all packages have moved their systemd rules to /usr
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%configure \
--docdir=%{_docdir}/systemd \
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
--with-pamlibdir=/%{_lib}/security \
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=549
2014-03-12 15:55:28 +01:00
--with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
--with-dbussessionservicedir=%{_datadir}/dbus-1/services \
--with-dbussystemservicedir=%{_datadir}/dbus-1/system-services \
--with-dbusinterfacedir=%{_datadir}/dbus-1/interfaces \
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if 0%{?bootstrap}
--disable-gudev \
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
--disable-myhostname \
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
--disable-manpages \
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%else
- Add fix-dir-noatime-tmpfiles.patch: do not modify directory atime, which was preventing removing empty directories (bnc#751253, rh#810257). - Add improve-restart-behaviour.patch: prevent deadlock during try-restart (bnc#743218). - Add journal-bugfixes.patch: don't crash when rotating journal (bnc#768953) and prevent memleak at rotation time too. - Add ulimit-support.patch: add support for system wide ulimit (bnc#744818). - Add change-terminal.patch: use vt102 instead of vt100 as terminal for non-vc tty. - Package various .wants directories, which were no longer packaged due to plymouth units being removed from systemd package. - Fix buildrequires for manpages build. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=284
2012-07-03 18:31:03 +02:00
--enable-manpages \
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%if %{with python}
--with-python \
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
--enable-gtk-doc \
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
--with-nss-my-hostname-warning \
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%if %{with compat_libs}
--enable-compat-libs \
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
--enable-selinux \
--enable-split-usr \
--disable-static \
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
%if 0%{?suse_version} <= 1310
missing backslash OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=377
2013-05-13 20:45:42 +02:00
--with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \
- Do not build EFI support code in architectures on which the kernel does not support CONFIG_EFI, it won't work. (ia64 also supports it, but that's dead so is not included) - Do not build EFI support code in architectures on which the kernel does not support CONFIG_EFI, it won't work. (ia64 also supports it, but that's dead so is not included) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=671
2014-06-12 11:30:28 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=811
2014-11-07 13:36:25 +01:00
%if ! 0%{?has_efi}
- Do not build EFI support code in architectures on which the kernel does not support CONFIG_EFI, it won't work. (ia64 also supports it, but that's dead so is not included) - Do not build EFI support code in architectures on which the kernel does not support CONFIG_EFI, it won't work. (ia64 also supports it, but that's dead so is not included) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=671
2014-06-12 11:30:28 +02:00
--disable-efi \
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
%endif
- Add configure flags to ensure boot.local/halt.local are run on startup/shutdown. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=379
2013-05-15 08:50:16 +02:00
--with-rc-local-script-path-start=/etc/init.d/boot.local \
--with-rc-local-script-path-stop=/etc/init.d/halt.local \
- Update to release 204: + systemd-nspawn creates etc/resolv.conf in container if needed. + systemd-nspawn will store metadata about container in container cgroup including its root directory. + cgroup hierarchy has been reworked, all objects are now suffxed (with .session for user sessions, .user for users, .nspawn for containers). All cgroup names are now escaped to preven collision of object names. + systemctl list-dependencies gained --plain, --reverse, --after and --before switches. + systemd-inhibit shows processes name taking inhibitor lock. + nss-myhostname will now resolve "localhost" implicitly. + .include is not allowed recursively anymore and only in unit files. Drop-in files should be favored in most cases. + systemd-analyze gained "critical-chain" command, to get slowest chain of units run during boot-up. + systemd-nspawn@.service has been added to easily run nspawn container for system services. Just start "systemd-nspawn@foobar.service" and container from /var/lib/container/foobar" will be booted. + systemd-cgls has new --machine parameter to list processes from one container. + ConditionSecurity= can now check for apparmor and SMACK. + /etc/systemd/sleep.conf has been introduced to configure which kernel operation will be execute when "suspend", "hibernate" or "hybrid-sleep" is requrested. It allow new kernel "freeze" state to be used too. (This setting won't have any effect if pm-utils is installed). + ENV{SYSTEMD_WANTS} in udev rules will now implicitly escape passed argument if applicable. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=388
2013-05-29 17:26:40 +02:00
--with-debug-shell=/bin/bash \
- 0009-polkit-Avoid-race-condition-in-scraping-proc.patch VUL-0: polkit: process subject race condition [bnc#835827] - Build with --disable-ima as the openSUSE kernel does not support IMA (CONFIG_IMA is not set) - Build with --disable-smack as the openSUSE kernel does not support smack (CONFIG_SECURITY_SMACK is not set) - 0009-polkit-Avoid-race-condition-in-scraping-proc.patch VUL-0: polkit: process subject race condition [bnc#835827] - Build with --disable-ima as the openSUSE kernel does not support IMA (CONFIG_IMA is not set) - Build with --disable-smack as the openSUSE kernel does not support smack (CONFIG_SECURITY_SMACK is not set) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=439
2013-09-19 09:46:03 +02:00
--disable-smack \
--disable-ima \
- Disable multi-seat-x build, since package xorg-x11-server currently in Factory no longer needs it. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=479
2013-12-20 11:55:16 +01:00
%if 0%{?suse_version} > 1310
--disable-multi-seat-x \
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%endif
%if %{without networkd}
--disable-networkd \
- Disable multi-seat-x build, since package xorg-x11-server currently in Factory no longer needs it. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=479
2013-12-20 11:55:16 +01:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=663
2014-06-10 13:19:53 +02:00
--disable-kdbus
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
make %{?_smp_mflags}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=567
2014-03-19 14:37:37 +01:00
%if ! 0%{?bootstrap}
make %{?_smp_mflags} update-man-list man
%endif
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%install
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=567
2014-03-19 14:37:37 +01:00
# Use refreshed manual pages
for man in man/*.[0-9]
do
section=${man##*.}
test -d man/man${section} || continue
new=man/man${section}/${man##*/}
if test -s $new -a $new -nt $man
then
cp -p $new $man
else
sed -ri 's@"(systemd) 209"@"\1 %{version}"@' $man
fi
done
- Explicitly list libattr-devel as BuildRequires OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=395
2013-06-17 14:29:15 +02:00
make install DESTDIR="%buildroot"
- Recommends dbus-1-python, do not requires python (bnc#716939) - Add private_tmp_crash.patch: prevent crash in debug mode (bnc#699829). - Add systemctl-completion-fix.patch: fix incorrect bash completion with some commands (git). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=217
2011-10-14 17:47:16 +02:00
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
# move to %{_lib}
%if ! 0%{?bootstrap}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
mkdir -p %{buildroot}/{sbin,lib,bin}
ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm
ln -sf %{_bindir}/systemd-ask-password %{buildroot}/bin/systemd-ask-password
ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl
ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd
- links more manpages for migrated tools (from Christopher Yeleighton). - disable boot.localnet service, ypbind service will do the right thing now (bnc#716746) - add xdm-display-manager.patch: pull xdm.service instead of display-manager.service (needed until xdm initscript is migrated to native systemd service). - Add fix-permissions-btmp.patch: ensure btmp is owned only by root (bnc#777405). - Have the udev package create a tape group, as referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules (DimStar). - Add fix-bad-memory-access.patch: fix crash in journal rotation. - Add fix-dbus-crash.patch: fix D-Bus caused crash. - Add sync-on-shutdown.patch: ensure sync is done when initiating shutdown. - Add mount-efivars.patch: mount efivars if booting on UEFI. - Ship a empty systemd-journald initscript in systemd-logger to stop insserv to complain about missing syslog dependency. - Update 0001-service-Fix-dependencies-added-when-parsing-insserv..patch with bug fixes from Debian. old: Base:System/systemd new: home:fcrozat:branches:Base:System/systemd rev NoneIndex: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch =================================================================== --- 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 311) +++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 5) @@ -1,17 +1,35 @@ -From 6620bceb7233a830be3635a4f7a7dc75c13a9c8e Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Fri, 30 Sep 2011 14:12:45 +0200 -Subject: [PATCH] service: Fix dependencies added when parsing insserv.conf - ---- - src/service.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -Index: systemd-41/src/service.c +Index: systemd-195/src/core/service.c =================================================================== ---- systemd-41.orig/src/core/service.c -+++ systemd-41/src/core/service.c -@@ -3210,23 +3210,30 @@ static void sysv_facility_in_insserv_con +--- systemd-195.orig/src/core/service.c ++++ systemd-195/src/core/service.c +@@ -3391,12 +3391,13 @@ static void service_notify_message(Unit + + #ifdef HAVE_SYSV_COMPAT + +-#ifdef TARGET_SUSE +-static void sysv_facility_in_insserv_conf(Manager *mgr) { +- FILE *f=NULL; ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) ++static void sysv_parse_insserv_conf(Manager *mgr, const char* filename) { ++ FILE *f = NULL; + int r; + +- if (!(f = fopen("/etc/insserv.conf", "re"))) { ++ if (!(f = fopen(filename, "re"))) { ++ log_error("Failed to open file %s", filename); + r = errno == ENOENT ? 0 : -errno; + goto finish; + } +@@ -3410,7 +3411,7 @@ static void sysv_facility_in_insserv_con + break; + + r = -errno; +- log_error("Failed to read configuration file '/etc/insserv.conf': %s", strerror(-r)); ++ log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); + goto finish; + } + +@@ -3425,23 +3426,30 @@ static void sysv_facility_in_insserv_con Unit *u; if (sysv_translate_facility(parsed[0], NULL, &facility) < 0) continue; @@ -29,12 +47,12 @@ STRV_FOREACH (j, parsed+1) { - if (*j[0]=='+') { - e = UNIT_WANTS; -+ if (*j[0]=='+') ++ if (*j[0] == '+') name = *j+1; - } - else { - e = UNIT_REQUIRES; -+ else ++ else name = *j; - } + if (streq(name, "boot.localfs") || @@ -44,9 +62,54 @@ continue; - r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, e, dep, NULL, true); -+ r = unit_add_dependency_by_name_inverse(u, UNIT_BEFORE, dep, NULL, true); -+ if (*j[0]!='+') ++ r = unit_add_two_dependencies_by_name_inverse(u, UNIT_WANTS, UNIT_BEFORE, dep, NULL, true); ++ if (*j[0] != '+') + r = unit_add_dependency_by_name(u, UNIT_REQUIRES, dep, NULL, true); free(dep); } } +@@ -3454,6 +3462,35 @@ finish: + fclose(f); + + } ++ ++static void sysv_facility_in_insserv_conf(Manager *mgr) { ++ DIR *d =NULL; ++ struct dirent *de; ++ ++#ifdef TARGET_DEBIAN ++ if (!(d = opendir("/etc/insserv.conf.d/"))) ++ if (errno != ENOENT) { ++ log_warning("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); ++ goto finish; ++ } ++ ++ while ((de = readdir(d))) { ++ char *path = NULL; ++ if (ignore_file(de->d_name)) ++ continue; ++ ++ path = join("/etc/insserv.conf.d/", de->d_name, NULL); ++ sysv_parse_insserv_conf(mgr, path); ++ free(path); ++ } ++finish: ++ if (d) ++ closedir(d); ++#endif ++ ++ sysv_parse_insserv_conf(mgr, "/etc/insserv.conf"); ++} ++ + #endif + + static int service_enumerate(Manager *m) { +@@ -3604,7 +3641,7 @@ static int service_enumerate(Manager *m) + + r = 0; + +-#ifdef TARGET_SUSE ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) + sysv_facility_in_insserv_conf (m); + #endif + Index: systemd-mini.changes =================================================================== --- systemd-mini.changes (revision 311) +++ systemd-mini.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd-mini.spec =================================================================== --- systemd-mini.spec (revision 311) +++ systemd-mini.spec (revision 5) @@ -102,6 +102,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -128,6 +129,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -137,6 +140,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -151,8 +162,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -313,6 +322,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -337,6 +347,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -368,8 +384,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -378,11 +400,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -392,7 +409,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -415,8 +432,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -442,8 +458,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -532,6 +552,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -724,6 +746,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -787,7 +813,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -878,6 +908,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: systemd.changes =================================================================== --- systemd.changes (revision 311) +++ systemd.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd.spec =================================================================== --- systemd.spec (revision 311) +++ systemd.spec (revision 5) @@ -97,6 +97,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -123,6 +124,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -132,6 +135,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -146,8 +157,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -308,6 +317,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -332,6 +342,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -363,8 +379,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -373,11 +395,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -387,7 +404,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -410,8 +427,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -437,8 +453,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -527,6 +547,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -719,6 +741,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -782,7 +808,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -873,6 +903,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: fix-bad-memory-access.patch =================================================================== --- fix-bad-memory-access.patch (added) +++ fix-bad-memory-access.patch (revision 5) @@ -0,0 +1,23 @@ +From 7d73c1343be02a59b17de0cd34375deeb815d89c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 20 Nov 2012 00:19:27 +0100 +Subject: [PATCH] journald: fix bad memory access + +https://bugzilla.redhat.com/show_bug.cgi?id=875653 +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: systemd-195/src/journal/journald.c +=================================================================== +--- systemd-195.orig/src/journal/journald.c ++++ systemd-195/src/journal/journald.c +@@ -342,7 +342,7 @@ static void server_rotate(Server *s) { + HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { + r = journal_file_rotate(&f, s->compress, s->seal); + if (r < 0) +- if (f->path) ++ if (f) + log_error("Failed to rotate %s: %s", f->path, strerror(-r)); + else + log_error("Failed to create user journal: %s", strerror(-r)); Index: fix-dbus-crash.patch =================================================================== --- fix-dbus-crash.patch (added) +++ fix-dbus-crash.patch (revision 5) @@ -0,0 +1,32 @@ +From 645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Wed, 31 Oct 2012 11:53:56 +0100 +Subject: [PATCH] dbus-manager: fix a fatal dbus abort in + bus_manager_message_handler() + +If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref() +will be called twice on "reply", causing systemd to crash. So remove +the call to dbus_message_unref(); it is unnecessary because of +the cleanup attribute on "reply". + +[zj: modified to leave one dbus_message_unref() alone, per Colin +Walters' comment.] +--- + src/core/dbus-manager.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index 2010241..3cf3e90 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -1436,7 +1436,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h); + if (r < 0) { + unit_file_list_free(h); +- dbus_message_unref(reply); + return bus_send_error_reply(connection, message, NULL, r); + } + +-- +1.7.10.4 + Index: fix-permissions-btmp.patch =================================================================== --- fix-permissions-btmp.patch (added) +++ fix-permissions-btmp.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-44/tmpfiles.d/systemd.conf +=================================================================== +--- systemd-44.orig/tmpfiles.d/systemd.conf ++++ systemd-44/tmpfiles.d/systemd.conf +@@ -11,7 +11,7 @@ d /run/user 0755 root root 10d + F /run/utmp 0664 root utmp - + + f /var/log/wtmp 0664 root utmp - +-f /var/log/btmp 0600 root utmp - ++f /var/log/btmp 0600 root root - + + d /var/cache/man - - - 30d + Index: mount-efivars.patch =================================================================== --- mount-efivars.patch (added) +++ mount-efivars.patch (revision 5) @@ -0,0 +1,336 @@ +From f271dd97622b656c1c013d181ea615c671cc2438 Mon Sep 17 00:00:00 2001 +From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> +Date: Sat, 27 Oct 2012 11:23:22 +0800 +Subject: [PATCH] systemd: mount the EFI variable filesystem +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add efivarfs to the mount_table in mount-setup.c, so the EFI variable +filesystem will be mounted when systemd executed. + +The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel. + +Cc: Kay Sievers <kay@vrfy.org> +Cc: Lennart Poettering <lennart@poettering.net> +Cc: Mantas Mikulėnas <grawity@gmail.com> +Cc: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> +Cc: Matt Fleming <matt.fleming@intel.com> +Cc: Jeremy Kerr <jeremy.kerr@canonical.com> +Cc: Matthew Garrett <mjg@redhat.com> +Signed-off-by: Lee, Chun-Yi <jlee@suse.com> +--- + src/core/kmod-setup.c | 7 ++++--- + src/core/mount-setup.c | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index cc2a2d9..ce8a8e7 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -31,9 +31,10 @@ + #include "kmod-setup.h" + + static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "unix", "/proc/net/unix" ++ "autofs4", "/sys/class/misc/autofs", ++ "ipv6", "/sys/module/ipv6", ++ "efivarfs", "/sys/firmware/efi/efivars", ++ "unix", "/proc/net/unix" + }; + + #pragma GCC diagnostic push +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 0fd112f..9894c7f 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, + { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, + { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +-- +1.7.10.4 + +From c1e5704657315b436c0409e8172c1fcb76adccad Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:06:27 +0100 +Subject: [PATCH] shared: add is_efiboot() + +--- + src/shared/util.c | 4 ++++ + src/shared/util.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 2a8afae..9983695 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -77,6 +77,10 @@ char **saved_argv = NULL; + static volatile unsigned cached_columns = 0; + static volatile unsigned cached_lines = 0; + ++bool is_efiboot(void) { ++ return access("/sys/firmware/efi", F_OK) >= 0; ++} ++ + size_t page_size(void) { + static __thread size_t pgsz = 0; + long r; +diff --git a/src/shared/util.h b/src/shared/util.h +index e387b12..99972cc 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -90,6 +90,8 @@ union dirent_storage { + #define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m" + #define ANSI_HIGHLIGHT_OFF "\x1B[0m" + ++bool is_efiboot(void); ++ + usec_t now(clockid_t clock); + + dual_timestamp* dual_timestamp_get(dual_timestamp *ts); +-- +1.7.10.4 + +From 1022373284b7562431fb0a6dba45db8af089a0e3 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:54:19 +0100 +Subject: [PATCH] kmod-setup: add conditional module loading callback + +--- + src/core/kmod-setup.c | 32 ++++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index ce8a8e7..383a6b2 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -30,11 +30,17 @@ + + #include "kmod-setup.h" + +-static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "efivarfs", "/sys/firmware/efi/efivars", +- "unix", "/proc/net/unix" ++typedef struct Kmodule { ++ const char *name; ++ const char *directory; ++ bool (*condition_fn)(void); ++} KModule; ++ ++static const KModule kmod_table[] = { ++ { "autofs4", "/sys/class/misc/autofs", NULL } , ++ { "ipv6", "/sys/module/ipv6", NULL }, ++ { "efivarfs", "/sys/firmware/efi/efivars", NULL }, ++ { "unix", "/proc/net/unix", NULL } , + }; + + #pragma GCC diagnostic push +@@ -42,7 +48,8 @@ static const char * const kmod_table[] = { + static void systemd_kmod_log(void *data, int priority, const char *file, int line, + const char *fn, const char *format, va_list args) + { +- log_metav(priority, file, line, fn, format, args); ++ /* library logging is enabled at debug only */ ++ log_metav(LOG_DEBUG, file, line, fn, format, args); + } + #pragma GCC diagnostic pop + +@@ -53,13 +60,15 @@ int kmod_setup(void) { + int err; + + for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) { ++ if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn()) ++ continue; + +- if (access(kmod_table[i+1], F_OK) >= 0) ++ if (access(kmod_table[i].directory, F_OK) >= 0) + continue; + + log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. " + "We'll now try to work around this by loading the module...", +- kmod_table[i]); ++ kmod_table[i].name); + + if (!ctx) { + ctx = kmod_new(NULL, NULL); +@@ -69,13 +78,12 @@ int kmod_setup(void) { + } + + kmod_set_log_fn(ctx, systemd_kmod_log, NULL); +- + kmod_load_resources(ctx); + } + +- err = kmod_module_new_from_name(ctx, kmod_table[i], &mod); ++ err = kmod_module_new_from_name(ctx, kmod_table[i].name, &mod); + if (err < 0) { +- log_error("Failed to load module '%s'", kmod_table[i]); ++ log_error("Failed to lookup module '%s'", kmod_table[i].name); + continue; + } + +@@ -85,7 +93,7 @@ int kmod_setup(void) { + else if (err == KMOD_PROBE_APPLY_BLACKLIST) + log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); + else +- log_error("Failed to insert '%s'", kmod_module_get_name(mod)); ++ log_error("Failed to insert module '%s'", kmod_module_get_name(mod)); + + kmod_module_unref(mod); + } +-- +1.7.10.4 + +From 3dfb265083347cb5700dc38f7cc0f479f378e6e9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:55:23 +0100 +Subject: [PATCH] kmod-setup: mounting efivarfs, *after* we tried to mount it, + is pointless + +The mount() system call, which we issue before loading modules, will trigger +a modprobe by the kernel and block until it returns. Trying to load it again +later, will have exactly the same result as the first time. +--- + src/core/kmod-setup.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 383a6b2..20ab232 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -39,7 +39,6 @@ typedef struct Kmodule { + static const KModule kmod_table[] = { + { "autofs4", "/sys/class/misc/autofs", NULL } , + { "ipv6", "/sys/module/ipv6", NULL }, +- { "efivarfs", "/sys/firmware/efi/efivars", NULL }, + { "unix", "/proc/net/unix", NULL } , + }; + +-- +1.7.10.4 + +From 6aa220e019f9dffd96590b06b68f937985204109 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 17:03:48 +0100 +Subject: [PATCH] mount-setup: try mounting 'efivarfs' only if the system + bootet with EFI + +--- + TODO | 3 --- + src/core/mount-setup.c | 50 ++++++++++++++++++++++++++++++++---------------- + 2 files changed, 34 insertions(+), 19 deletions(-) + +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 9894c7f..98614d0 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -46,14 +46,20 @@ + #define TTY_GID 5 + #endif + ++typedef enum MountMode { ++ MNT_NONE = 0, ++ MNT_FATAL = 1 << 0, ++ MNT_IN_CONTAINER = 1 << 1, ++} MountMode; ++ + typedef struct MountPoint { + const char *what; + const char *where; + const char *type; + const char *options; + unsigned long flags; +- bool fatal; +- bool in_container; ++ bool (*condition_fn)(void); ++ MountMode mode; + } MountPoint; + + /* The first three entries we might need before SELinux is up. The +@@ -62,16 +68,26 @@ typedef struct MountPoint { + #define N_EARLY_MOUNT 4 + + static const MountPoint mount_table[] = { +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, +- { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, +- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, false, true }, +- { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, true }, ++ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_NONE }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ is_efiboot, MNT_NONE }, ++ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, ++ NULL, MNT_IN_CONTAINER }, ++ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_IN_CONTAINER }, ++ { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_IN_CONTAINER }, + }; + + /* These are API file systems that might be mounted by other software, +@@ -119,6 +135,9 @@ static int mount_one(const MountPoint *p, bool relabel) { + + assert(p); + ++ if (p->condition_fn && !p->condition_fn()) ++ return 0; ++ + /* Relabel first, just in case */ + if (relabel) + label_fix(p->where, true, true); +@@ -131,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) { + return 0; + + /* Skip securityfs in a container */ +- if (!p->in_container && detect_container(NULL) > 0) ++ if (!(p->mode & MNT_IN_CONTAINER) && detect_container(NULL) > 0) + return 0; + + /* The access mode here doesn't really matter too much, since +@@ -149,8 +168,8 @@ static int mount_one(const MountPoint *p, bool relabel) { + p->type, + p->flags, + p->options) < 0) { +- log_full(p->fatal ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); +- return p->fatal ? -errno : 0; ++ log_full((p->mode & MNT_FATAL) ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); ++ return (p->mode & MNT_FATAL) ? -errno : 0; + } + + /* Relabel again, since we now mounted something fresh here */ +@@ -289,7 +308,6 @@ int mount_cgroup_controllers(char ***join_controllers) { + p.type = "cgroup"; + p.options = options; + p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV; +- p.fatal = false; + + r = mount_one(&p, true); + free(controller); +-- +1.7.10.4 + Index: sync-on-shutdown.patch =================================================================== --- sync-on-shutdown.patch (added) +++ sync-on-shutdown.patch (revision 5) @@ -0,0 +1,49 @@ +From 0049f05a8bb82c3e084bacc5945596761d706c55 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 16 Nov 2012 01:30:29 +0100 +Subject: [PATCH] shutdown: readd explicit sync() when shutting down + +As it turns out reboot() doesn't actually imply a file system sync, but +only a disk sync. Accordingly, readd explicit sync() invocations +immediately before we invoke reboot(). + +This is much less dramatic than it might sounds as we umount all +disks/read-only remount them anyway before going down. +--- + src/core/service.c | 1 + + src/core/shutdown.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/core/service.c b/src/core/service.c +index cf08485..df72aba 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2485,6 +2485,7 @@ static int service_start_limit_test(Service *s) { + + case SERVICE_START_LIMIT_REBOOT_IMMEDIATE: + log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id); ++ sync(); + reboot(RB_AUTOBOOT); + break; + +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index cc8c57b..b59aef1 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -273,6 +273,13 @@ int main(int argc, char *argv[]) { + } + } + ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. So let's do this here, but not ++ * needlessly slow down containers. */ ++ if (!in_container) ++ sync(); ++ + if (cmd == LINUX_REBOOT_CMD_KEXEC) { + + if (!in_container) { +-- +1.7.10.4 + Index: systemd-journald.init =================================================================== --- systemd-journald.init (added) +++ systemd-journald.init (revision 5) @@ -0,0 +1,33 @@ +#! /bin/sh +# +# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# /etc/init.d/systemd-journald +# +### BEGIN INIT INFO +# Provides: syslog +# Required-Start: $null +# Required-Stop: $null +# Default-Start: 2 3 5 +# Default-Stop: +# Short-Description: compat wrapper for journald +# Description: compat wrapper for journald +### END INIT INFO + +. /etc/rc.status + +rc_reset + +case "$1" in + start|stop|restart) + rc_failed 3 + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +rc_exit Index: xdm-display-manager.patch =================================================================== --- xdm-display-manager.patch (added) +++ xdm-display-manager.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-195/units/graphical.target +=================================================================== +--- systemd-195.orig/units/graphical.target ++++ systemd-195/units/graphical.target +@@ -11,7 +11,7 @@ Documentation=man:systemd.special(7) + Requires=multi-user.target + After=multi-user.target + Conflicts=rescue.target +-Wants=display-manager.service ++Wants=xdm.service + AllowIsolate=yes + + [Install] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=312
2012-11-20 13:10:12 +01:00
%if ! 0%{?bootstrap}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
ln -sf systemd-udevd.8 %{buildroot}/%{_mandir}/man8/udevd.8
- links more manpages for migrated tools (from Christopher Yeleighton). - disable boot.localnet service, ypbind service will do the right thing now (bnc#716746) - add xdm-display-manager.patch: pull xdm.service instead of display-manager.service (needed until xdm initscript is migrated to native systemd service). - Add fix-permissions-btmp.patch: ensure btmp is owned only by root (bnc#777405). - Have the udev package create a tape group, as referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules (DimStar). - Add fix-bad-memory-access.patch: fix crash in journal rotation. - Add fix-dbus-crash.patch: fix D-Bus caused crash. - Add sync-on-shutdown.patch: ensure sync is done when initiating shutdown. - Add mount-efivars.patch: mount efivars if booting on UEFI. - Ship a empty systemd-journald initscript in systemd-logger to stop insserv to complain about missing syslog dependency. - Update 0001-service-Fix-dependencies-added-when-parsing-insserv..patch with bug fixes from Debian. old: Base:System/systemd new: home:fcrozat:branches:Base:System/systemd rev NoneIndex: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch =================================================================== --- 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 311) +++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 5) @@ -1,17 +1,35 @@ -From 6620bceb7233a830be3635a4f7a7dc75c13a9c8e Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Fri, 30 Sep 2011 14:12:45 +0200 -Subject: [PATCH] service: Fix dependencies added when parsing insserv.conf - ---- - src/service.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -Index: systemd-41/src/service.c +Index: systemd-195/src/core/service.c =================================================================== ---- systemd-41.orig/src/core/service.c -+++ systemd-41/src/core/service.c -@@ -3210,23 +3210,30 @@ static void sysv_facility_in_insserv_con +--- systemd-195.orig/src/core/service.c ++++ systemd-195/src/core/service.c +@@ -3391,12 +3391,13 @@ static void service_notify_message(Unit + + #ifdef HAVE_SYSV_COMPAT + +-#ifdef TARGET_SUSE +-static void sysv_facility_in_insserv_conf(Manager *mgr) { +- FILE *f=NULL; ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) ++static void sysv_parse_insserv_conf(Manager *mgr, const char* filename) { ++ FILE *f = NULL; + int r; + +- if (!(f = fopen("/etc/insserv.conf", "re"))) { ++ if (!(f = fopen(filename, "re"))) { ++ log_error("Failed to open file %s", filename); + r = errno == ENOENT ? 0 : -errno; + goto finish; + } +@@ -3410,7 +3411,7 @@ static void sysv_facility_in_insserv_con + break; + + r = -errno; +- log_error("Failed to read configuration file '/etc/insserv.conf': %s", strerror(-r)); ++ log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); + goto finish; + } + +@@ -3425,23 +3426,30 @@ static void sysv_facility_in_insserv_con Unit *u; if (sysv_translate_facility(parsed[0], NULL, &facility) < 0) continue; @@ -29,12 +47,12 @@ STRV_FOREACH (j, parsed+1) { - if (*j[0]=='+') { - e = UNIT_WANTS; -+ if (*j[0]=='+') ++ if (*j[0] == '+') name = *j+1; - } - else { - e = UNIT_REQUIRES; -+ else ++ else name = *j; - } + if (streq(name, "boot.localfs") || @@ -44,9 +62,54 @@ continue; - r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, e, dep, NULL, true); -+ r = unit_add_dependency_by_name_inverse(u, UNIT_BEFORE, dep, NULL, true); -+ if (*j[0]!='+') ++ r = unit_add_two_dependencies_by_name_inverse(u, UNIT_WANTS, UNIT_BEFORE, dep, NULL, true); ++ if (*j[0] != '+') + r = unit_add_dependency_by_name(u, UNIT_REQUIRES, dep, NULL, true); free(dep); } } +@@ -3454,6 +3462,35 @@ finish: + fclose(f); + + } ++ ++static void sysv_facility_in_insserv_conf(Manager *mgr) { ++ DIR *d =NULL; ++ struct dirent *de; ++ ++#ifdef TARGET_DEBIAN ++ if (!(d = opendir("/etc/insserv.conf.d/"))) ++ if (errno != ENOENT) { ++ log_warning("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); ++ goto finish; ++ } ++ ++ while ((de = readdir(d))) { ++ char *path = NULL; ++ if (ignore_file(de->d_name)) ++ continue; ++ ++ path = join("/etc/insserv.conf.d/", de->d_name, NULL); ++ sysv_parse_insserv_conf(mgr, path); ++ free(path); ++ } ++finish: ++ if (d) ++ closedir(d); ++#endif ++ ++ sysv_parse_insserv_conf(mgr, "/etc/insserv.conf"); ++} ++ + #endif + + static int service_enumerate(Manager *m) { +@@ -3604,7 +3641,7 @@ static int service_enumerate(Manager *m) + + r = 0; + +-#ifdef TARGET_SUSE ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) + sysv_facility_in_insserv_conf (m); + #endif + Index: systemd-mini.changes =================================================================== --- systemd-mini.changes (revision 311) +++ systemd-mini.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd-mini.spec =================================================================== --- systemd-mini.spec (revision 311) +++ systemd-mini.spec (revision 5) @@ -102,6 +102,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -128,6 +129,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -137,6 +140,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -151,8 +162,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -313,6 +322,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -337,6 +347,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -368,8 +384,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -378,11 +400,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -392,7 +409,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -415,8 +432,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -442,8 +458,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -532,6 +552,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -724,6 +746,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -787,7 +813,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -878,6 +908,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: systemd.changes =================================================================== --- systemd.changes (revision 311) +++ systemd.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd.spec =================================================================== --- systemd.spec (revision 311) +++ systemd.spec (revision 5) @@ -97,6 +97,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -123,6 +124,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -132,6 +135,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -146,8 +157,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -308,6 +317,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -332,6 +342,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -363,8 +379,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -373,11 +395,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -387,7 +404,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -410,8 +427,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -437,8 +453,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -527,6 +547,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -719,6 +741,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -782,7 +808,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -873,6 +903,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: fix-bad-memory-access.patch =================================================================== --- fix-bad-memory-access.patch (added) +++ fix-bad-memory-access.patch (revision 5) @@ -0,0 +1,23 @@ +From 7d73c1343be02a59b17de0cd34375deeb815d89c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 20 Nov 2012 00:19:27 +0100 +Subject: [PATCH] journald: fix bad memory access + +https://bugzilla.redhat.com/show_bug.cgi?id=875653 +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: systemd-195/src/journal/journald.c +=================================================================== +--- systemd-195.orig/src/journal/journald.c ++++ systemd-195/src/journal/journald.c +@@ -342,7 +342,7 @@ static void server_rotate(Server *s) { + HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { + r = journal_file_rotate(&f, s->compress, s->seal); + if (r < 0) +- if (f->path) ++ if (f) + log_error("Failed to rotate %s: %s", f->path, strerror(-r)); + else + log_error("Failed to create user journal: %s", strerror(-r)); Index: fix-dbus-crash.patch =================================================================== --- fix-dbus-crash.patch (added) +++ fix-dbus-crash.patch (revision 5) @@ -0,0 +1,32 @@ +From 645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Wed, 31 Oct 2012 11:53:56 +0100 +Subject: [PATCH] dbus-manager: fix a fatal dbus abort in + bus_manager_message_handler() + +If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref() +will be called twice on "reply", causing systemd to crash. So remove +the call to dbus_message_unref(); it is unnecessary because of +the cleanup attribute on "reply". + +[zj: modified to leave one dbus_message_unref() alone, per Colin +Walters' comment.] +--- + src/core/dbus-manager.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index 2010241..3cf3e90 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -1436,7 +1436,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h); + if (r < 0) { + unit_file_list_free(h); +- dbus_message_unref(reply); + return bus_send_error_reply(connection, message, NULL, r); + } + +-- +1.7.10.4 + Index: fix-permissions-btmp.patch =================================================================== --- fix-permissions-btmp.patch (added) +++ fix-permissions-btmp.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-44/tmpfiles.d/systemd.conf +=================================================================== +--- systemd-44.orig/tmpfiles.d/systemd.conf ++++ systemd-44/tmpfiles.d/systemd.conf +@@ -11,7 +11,7 @@ d /run/user 0755 root root 10d + F /run/utmp 0664 root utmp - + + f /var/log/wtmp 0664 root utmp - +-f /var/log/btmp 0600 root utmp - ++f /var/log/btmp 0600 root root - + + d /var/cache/man - - - 30d + Index: mount-efivars.patch =================================================================== --- mount-efivars.patch (added) +++ mount-efivars.patch (revision 5) @@ -0,0 +1,336 @@ +From f271dd97622b656c1c013d181ea615c671cc2438 Mon Sep 17 00:00:00 2001 +From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> +Date: Sat, 27 Oct 2012 11:23:22 +0800 +Subject: [PATCH] systemd: mount the EFI variable filesystem +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add efivarfs to the mount_table in mount-setup.c, so the EFI variable +filesystem will be mounted when systemd executed. + +The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel. + +Cc: Kay Sievers <kay@vrfy.org> +Cc: Lennart Poettering <lennart@poettering.net> +Cc: Mantas Mikulėnas <grawity@gmail.com> +Cc: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> +Cc: Matt Fleming <matt.fleming@intel.com> +Cc: Jeremy Kerr <jeremy.kerr@canonical.com> +Cc: Matthew Garrett <mjg@redhat.com> +Signed-off-by: Lee, Chun-Yi <jlee@suse.com> +--- + src/core/kmod-setup.c | 7 ++++--- + src/core/mount-setup.c | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index cc2a2d9..ce8a8e7 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -31,9 +31,10 @@ + #include "kmod-setup.h" + + static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "unix", "/proc/net/unix" ++ "autofs4", "/sys/class/misc/autofs", ++ "ipv6", "/sys/module/ipv6", ++ "efivarfs", "/sys/firmware/efi/efivars", ++ "unix", "/proc/net/unix" + }; + + #pragma GCC diagnostic push +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 0fd112f..9894c7f 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, + { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, + { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +-- +1.7.10.4 + +From c1e5704657315b436c0409e8172c1fcb76adccad Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:06:27 +0100 +Subject: [PATCH] shared: add is_efiboot() + +--- + src/shared/util.c | 4 ++++ + src/shared/util.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 2a8afae..9983695 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -77,6 +77,10 @@ char **saved_argv = NULL; + static volatile unsigned cached_columns = 0; + static volatile unsigned cached_lines = 0; + ++bool is_efiboot(void) { ++ return access("/sys/firmware/efi", F_OK) >= 0; ++} ++ + size_t page_size(void) { + static __thread size_t pgsz = 0; + long r; +diff --git a/src/shared/util.h b/src/shared/util.h +index e387b12..99972cc 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -90,6 +90,8 @@ union dirent_storage { + #define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m" + #define ANSI_HIGHLIGHT_OFF "\x1B[0m" + ++bool is_efiboot(void); ++ + usec_t now(clockid_t clock); + + dual_timestamp* dual_timestamp_get(dual_timestamp *ts); +-- +1.7.10.4 + +From 1022373284b7562431fb0a6dba45db8af089a0e3 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:54:19 +0100 +Subject: [PATCH] kmod-setup: add conditional module loading callback + +--- + src/core/kmod-setup.c | 32 ++++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index ce8a8e7..383a6b2 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -30,11 +30,17 @@ + + #include "kmod-setup.h" + +-static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "efivarfs", "/sys/firmware/efi/efivars", +- "unix", "/proc/net/unix" ++typedef struct Kmodule { ++ const char *name; ++ const char *directory; ++ bool (*condition_fn)(void); ++} KModule; ++ ++static const KModule kmod_table[] = { ++ { "autofs4", "/sys/class/misc/autofs", NULL } , ++ { "ipv6", "/sys/module/ipv6", NULL }, ++ { "efivarfs", "/sys/firmware/efi/efivars", NULL }, ++ { "unix", "/proc/net/unix", NULL } , + }; + + #pragma GCC diagnostic push +@@ -42,7 +48,8 @@ static const char * const kmod_table[] = { + static void systemd_kmod_log(void *data, int priority, const char *file, int line, + const char *fn, const char *format, va_list args) + { +- log_metav(priority, file, line, fn, format, args); ++ /* library logging is enabled at debug only */ ++ log_metav(LOG_DEBUG, file, line, fn, format, args); + } + #pragma GCC diagnostic pop + +@@ -53,13 +60,15 @@ int kmod_setup(void) { + int err; + + for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) { ++ if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn()) ++ continue; + +- if (access(kmod_table[i+1], F_OK) >= 0) ++ if (access(kmod_table[i].directory, F_OK) >= 0) + continue; + + log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. " + "We'll now try to work around this by loading the module...", +- kmod_table[i]); ++ kmod_table[i].name); + + if (!ctx) { + ctx = kmod_new(NULL, NULL); +@@ -69,13 +78,12 @@ int kmod_setup(void) { + } + + kmod_set_log_fn(ctx, systemd_kmod_log, NULL); +- + kmod_load_resources(ctx); + } + +- err = kmod_module_new_from_name(ctx, kmod_table[i], &mod); ++ err = kmod_module_new_from_name(ctx, kmod_table[i].name, &mod); + if (err < 0) { +- log_error("Failed to load module '%s'", kmod_table[i]); ++ log_error("Failed to lookup module '%s'", kmod_table[i].name); + continue; + } + +@@ -85,7 +93,7 @@ int kmod_setup(void) { + else if (err == KMOD_PROBE_APPLY_BLACKLIST) + log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); + else +- log_error("Failed to insert '%s'", kmod_module_get_name(mod)); ++ log_error("Failed to insert module '%s'", kmod_module_get_name(mod)); + + kmod_module_unref(mod); + } +-- +1.7.10.4 + +From 3dfb265083347cb5700dc38f7cc0f479f378e6e9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:55:23 +0100 +Subject: [PATCH] kmod-setup: mounting efivarfs, *after* we tried to mount it, + is pointless + +The mount() system call, which we issue before loading modules, will trigger +a modprobe by the kernel and block until it returns. Trying to load it again +later, will have exactly the same result as the first time. +--- + src/core/kmod-setup.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 383a6b2..20ab232 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -39,7 +39,6 @@ typedef struct Kmodule { + static const KModule kmod_table[] = { + { "autofs4", "/sys/class/misc/autofs", NULL } , + { "ipv6", "/sys/module/ipv6", NULL }, +- { "efivarfs", "/sys/firmware/efi/efivars", NULL }, + { "unix", "/proc/net/unix", NULL } , + }; + +-- +1.7.10.4 + +From 6aa220e019f9dffd96590b06b68f937985204109 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 17:03:48 +0100 +Subject: [PATCH] mount-setup: try mounting 'efivarfs' only if the system + bootet with EFI + +--- + TODO | 3 --- + src/core/mount-setup.c | 50 ++++++++++++++++++++++++++++++++---------------- + 2 files changed, 34 insertions(+), 19 deletions(-) + +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 9894c7f..98614d0 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -46,14 +46,20 @@ + #define TTY_GID 5 + #endif + ++typedef enum MountMode { ++ MNT_NONE = 0, ++ MNT_FATAL = 1 << 0, ++ MNT_IN_CONTAINER = 1 << 1, ++} MountMode; ++ + typedef struct MountPoint { + const char *what; + const char *where; + const char *type; + const char *options; + unsigned long flags; +- bool fatal; +- bool in_container; ++ bool (*condition_fn)(void); ++ MountMode mode; + } MountPoint; + + /* The first three entries we might need before SELinux is up. The +@@ -62,16 +68,26 @@ typedef struct MountPoint { + #define N_EARLY_MOUNT 4 + + static const MountPoint mount_table[] = { +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, +- { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, +- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, false, true }, +- { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, true }, ++ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_NONE }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ is_efiboot, MNT_NONE }, ++ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, ++ NULL, MNT_IN_CONTAINER }, ++ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_IN_CONTAINER }, ++ { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_IN_CONTAINER }, + }; + + /* These are API file systems that might be mounted by other software, +@@ -119,6 +135,9 @@ static int mount_one(const MountPoint *p, bool relabel) { + + assert(p); + ++ if (p->condition_fn && !p->condition_fn()) ++ return 0; ++ + /* Relabel first, just in case */ + if (relabel) + label_fix(p->where, true, true); +@@ -131,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) { + return 0; + + /* Skip securityfs in a container */ +- if (!p->in_container && detect_container(NULL) > 0) ++ if (!(p->mode & MNT_IN_CONTAINER) && detect_container(NULL) > 0) + return 0; + + /* The access mode here doesn't really matter too much, since +@@ -149,8 +168,8 @@ static int mount_one(const MountPoint *p, bool relabel) { + p->type, + p->flags, + p->options) < 0) { +- log_full(p->fatal ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); +- return p->fatal ? -errno : 0; ++ log_full((p->mode & MNT_FATAL) ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); ++ return (p->mode & MNT_FATAL) ? -errno : 0; + } + + /* Relabel again, since we now mounted something fresh here */ +@@ -289,7 +308,6 @@ int mount_cgroup_controllers(char ***join_controllers) { + p.type = "cgroup"; + p.options = options; + p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV; +- p.fatal = false; + + r = mount_one(&p, true); + free(controller); +-- +1.7.10.4 + Index: sync-on-shutdown.patch =================================================================== --- sync-on-shutdown.patch (added) +++ sync-on-shutdown.patch (revision 5) @@ -0,0 +1,49 @@ +From 0049f05a8bb82c3e084bacc5945596761d706c55 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 16 Nov 2012 01:30:29 +0100 +Subject: [PATCH] shutdown: readd explicit sync() when shutting down + +As it turns out reboot() doesn't actually imply a file system sync, but +only a disk sync. Accordingly, readd explicit sync() invocations +immediately before we invoke reboot(). + +This is much less dramatic than it might sounds as we umount all +disks/read-only remount them anyway before going down. +--- + src/core/service.c | 1 + + src/core/shutdown.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/core/service.c b/src/core/service.c +index cf08485..df72aba 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2485,6 +2485,7 @@ static int service_start_limit_test(Service *s) { + + case SERVICE_START_LIMIT_REBOOT_IMMEDIATE: + log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id); ++ sync(); + reboot(RB_AUTOBOOT); + break; + +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index cc8c57b..b59aef1 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -273,6 +273,13 @@ int main(int argc, char *argv[]) { + } + } + ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. So let's do this here, but not ++ * needlessly slow down containers. */ ++ if (!in_container) ++ sync(); ++ + if (cmd == LINUX_REBOOT_CMD_KEXEC) { + + if (!in_container) { +-- +1.7.10.4 + Index: systemd-journald.init =================================================================== --- systemd-journald.init (added) +++ systemd-journald.init (revision 5) @@ -0,0 +1,33 @@ +#! /bin/sh +# +# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# /etc/init.d/systemd-journald +# +### BEGIN INIT INFO +# Provides: syslog +# Required-Start: $null +# Required-Stop: $null +# Default-Start: 2 3 5 +# Default-Stop: +# Short-Description: compat wrapper for journald +# Description: compat wrapper for journald +### END INIT INFO + +. /etc/rc.status + +rc_reset + +case "$1" in + start|stop|restart) + rc_failed 3 + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +rc_exit Index: xdm-display-manager.patch =================================================================== --- xdm-display-manager.patch (added) +++ xdm-display-manager.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-195/units/graphical.target +=================================================================== +--- systemd-195.orig/units/graphical.target ++++ systemd-195/units/graphical.target +@@ -11,7 +11,7 @@ Documentation=man:systemd.special(7) + Requires=multi-user.target + After=multi-user.target + Conflicts=rescue.target +-Wants=display-manager.service ++Wants=xdm.service + AllowIsolate=yes + + [Install] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=312
2012-11-20 13:10:12 +01:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
%if 0%{?suse_version} <= 1310
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
ln -sf /lib/firmware %{buildroot}/usr/lib/firmware
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
%endif
- links more manpages for migrated tools (from Christopher Yeleighton). - disable boot.localnet service, ypbind service will do the right thing now (bnc#716746) - add xdm-display-manager.patch: pull xdm.service instead of display-manager.service (needed until xdm initscript is migrated to native systemd service). - Add fix-permissions-btmp.patch: ensure btmp is owned only by root (bnc#777405). - Have the udev package create a tape group, as referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules (DimStar). - Add fix-bad-memory-access.patch: fix crash in journal rotation. - Add fix-dbus-crash.patch: fix D-Bus caused crash. - Add sync-on-shutdown.patch: ensure sync is done when initiating shutdown. - Add mount-efivars.patch: mount efivars if booting on UEFI. - Ship a empty systemd-journald initscript in systemd-logger to stop insserv to complain about missing syslog dependency. - Update 0001-service-Fix-dependencies-added-when-parsing-insserv..patch with bug fixes from Debian. old: Base:System/systemd new: home:fcrozat:branches:Base:System/systemd rev NoneIndex: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch =================================================================== --- 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 311) +++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 5) @@ -1,17 +1,35 @@ -From 6620bceb7233a830be3635a4f7a7dc75c13a9c8e Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Fri, 30 Sep 2011 14:12:45 +0200 -Subject: [PATCH] service: Fix dependencies added when parsing insserv.conf - ---- - src/service.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -Index: systemd-41/src/service.c +Index: systemd-195/src/core/service.c =================================================================== ---- systemd-41.orig/src/core/service.c -+++ systemd-41/src/core/service.c -@@ -3210,23 +3210,30 @@ static void sysv_facility_in_insserv_con +--- systemd-195.orig/src/core/service.c ++++ systemd-195/src/core/service.c +@@ -3391,12 +3391,13 @@ static void service_notify_message(Unit + + #ifdef HAVE_SYSV_COMPAT + +-#ifdef TARGET_SUSE +-static void sysv_facility_in_insserv_conf(Manager *mgr) { +- FILE *f=NULL; ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) ++static void sysv_parse_insserv_conf(Manager *mgr, const char* filename) { ++ FILE *f = NULL; + int r; + +- if (!(f = fopen("/etc/insserv.conf", "re"))) { ++ if (!(f = fopen(filename, "re"))) { ++ log_error("Failed to open file %s", filename); + r = errno == ENOENT ? 0 : -errno; + goto finish; + } +@@ -3410,7 +3411,7 @@ static void sysv_facility_in_insserv_con + break; + + r = -errno; +- log_error("Failed to read configuration file '/etc/insserv.conf': %s", strerror(-r)); ++ log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); + goto finish; + } + +@@ -3425,23 +3426,30 @@ static void sysv_facility_in_insserv_con Unit *u; if (sysv_translate_facility(parsed[0], NULL, &facility) < 0) continue; @@ -29,12 +47,12 @@ STRV_FOREACH (j, parsed+1) { - if (*j[0]=='+') { - e = UNIT_WANTS; -+ if (*j[0]=='+') ++ if (*j[0] == '+') name = *j+1; - } - else { - e = UNIT_REQUIRES; -+ else ++ else name = *j; - } + if (streq(name, "boot.localfs") || @@ -44,9 +62,54 @@ continue; - r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, e, dep, NULL, true); -+ r = unit_add_dependency_by_name_inverse(u, UNIT_BEFORE, dep, NULL, true); -+ if (*j[0]!='+') ++ r = unit_add_two_dependencies_by_name_inverse(u, UNIT_WANTS, UNIT_BEFORE, dep, NULL, true); ++ if (*j[0] != '+') + r = unit_add_dependency_by_name(u, UNIT_REQUIRES, dep, NULL, true); free(dep); } } +@@ -3454,6 +3462,35 @@ finish: + fclose(f); + + } ++ ++static void sysv_facility_in_insserv_conf(Manager *mgr) { ++ DIR *d =NULL; ++ struct dirent *de; ++ ++#ifdef TARGET_DEBIAN ++ if (!(d = opendir("/etc/insserv.conf.d/"))) ++ if (errno != ENOENT) { ++ log_warning("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); ++ goto finish; ++ } ++ ++ while ((de = readdir(d))) { ++ char *path = NULL; ++ if (ignore_file(de->d_name)) ++ continue; ++ ++ path = join("/etc/insserv.conf.d/", de->d_name, NULL); ++ sysv_parse_insserv_conf(mgr, path); ++ free(path); ++ } ++finish: ++ if (d) ++ closedir(d); ++#endif ++ ++ sysv_parse_insserv_conf(mgr, "/etc/insserv.conf"); ++} ++ + #endif + + static int service_enumerate(Manager *m) { +@@ -3604,7 +3641,7 @@ static int service_enumerate(Manager *m) + + r = 0; + +-#ifdef TARGET_SUSE ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) + sysv_facility_in_insserv_conf (m); + #endif + Index: systemd-mini.changes =================================================================== --- systemd-mini.changes (revision 311) +++ systemd-mini.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd-mini.spec =================================================================== --- systemd-mini.spec (revision 311) +++ systemd-mini.spec (revision 5) @@ -102,6 +102,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -128,6 +129,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -137,6 +140,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -151,8 +162,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -313,6 +322,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -337,6 +347,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -368,8 +384,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -378,11 +400,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -392,7 +409,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -415,8 +432,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -442,8 +458,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -532,6 +552,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -724,6 +746,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -787,7 +813,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -878,6 +908,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: systemd.changes =================================================================== --- systemd.changes (revision 311) +++ systemd.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd.spec =================================================================== --- systemd.spec (revision 311) +++ systemd.spec (revision 5) @@ -97,6 +97,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -123,6 +124,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -132,6 +135,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -146,8 +157,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -308,6 +317,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -332,6 +342,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -363,8 +379,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -373,11 +395,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -387,7 +404,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -410,8 +427,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -437,8 +453,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -527,6 +547,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -719,6 +741,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -782,7 +808,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -873,6 +903,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: fix-bad-memory-access.patch =================================================================== --- fix-bad-memory-access.patch (added) +++ fix-bad-memory-access.patch (revision 5) @@ -0,0 +1,23 @@ +From 7d73c1343be02a59b17de0cd34375deeb815d89c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 20 Nov 2012 00:19:27 +0100 +Subject: [PATCH] journald: fix bad memory access + +https://bugzilla.redhat.com/show_bug.cgi?id=875653 +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: systemd-195/src/journal/journald.c +=================================================================== +--- systemd-195.orig/src/journal/journald.c ++++ systemd-195/src/journal/journald.c +@@ -342,7 +342,7 @@ static void server_rotate(Server *s) { + HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { + r = journal_file_rotate(&f, s->compress, s->seal); + if (r < 0) +- if (f->path) ++ if (f) + log_error("Failed to rotate %s: %s", f->path, strerror(-r)); + else + log_error("Failed to create user journal: %s", strerror(-r)); Index: fix-dbus-crash.patch =================================================================== --- fix-dbus-crash.patch (added) +++ fix-dbus-crash.patch (revision 5) @@ -0,0 +1,32 @@ +From 645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Wed, 31 Oct 2012 11:53:56 +0100 +Subject: [PATCH] dbus-manager: fix a fatal dbus abort in + bus_manager_message_handler() + +If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref() +will be called twice on "reply", causing systemd to crash. So remove +the call to dbus_message_unref(); it is unnecessary because of +the cleanup attribute on "reply". + +[zj: modified to leave one dbus_message_unref() alone, per Colin +Walters' comment.] +--- + src/core/dbus-manager.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index 2010241..3cf3e90 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -1436,7 +1436,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h); + if (r < 0) { + unit_file_list_free(h); +- dbus_message_unref(reply); + return bus_send_error_reply(connection, message, NULL, r); + } + +-- +1.7.10.4 + Index: fix-permissions-btmp.patch =================================================================== --- fix-permissions-btmp.patch (added) +++ fix-permissions-btmp.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-44/tmpfiles.d/systemd.conf +=================================================================== +--- systemd-44.orig/tmpfiles.d/systemd.conf ++++ systemd-44/tmpfiles.d/systemd.conf +@@ -11,7 +11,7 @@ d /run/user 0755 root root 10d + F /run/utmp 0664 root utmp - + + f /var/log/wtmp 0664 root utmp - +-f /var/log/btmp 0600 root utmp - ++f /var/log/btmp 0600 root root - + + d /var/cache/man - - - 30d + Index: mount-efivars.patch =================================================================== --- mount-efivars.patch (added) +++ mount-efivars.patch (revision 5) @@ -0,0 +1,336 @@ +From f271dd97622b656c1c013d181ea615c671cc2438 Mon Sep 17 00:00:00 2001 +From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> +Date: Sat, 27 Oct 2012 11:23:22 +0800 +Subject: [PATCH] systemd: mount the EFI variable filesystem +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add efivarfs to the mount_table in mount-setup.c, so the EFI variable +filesystem will be mounted when systemd executed. + +The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel. + +Cc: Kay Sievers <kay@vrfy.org> +Cc: Lennart Poettering <lennart@poettering.net> +Cc: Mantas Mikulėnas <grawity@gmail.com> +Cc: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> +Cc: Matt Fleming <matt.fleming@intel.com> +Cc: Jeremy Kerr <jeremy.kerr@canonical.com> +Cc: Matthew Garrett <mjg@redhat.com> +Signed-off-by: Lee, Chun-Yi <jlee@suse.com> +--- + src/core/kmod-setup.c | 7 ++++--- + src/core/mount-setup.c | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index cc2a2d9..ce8a8e7 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -31,9 +31,10 @@ + #include "kmod-setup.h" + + static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "unix", "/proc/net/unix" ++ "autofs4", "/sys/class/misc/autofs", ++ "ipv6", "/sys/module/ipv6", ++ "efivarfs", "/sys/firmware/efi/efivars", ++ "unix", "/proc/net/unix" + }; + + #pragma GCC diagnostic push +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 0fd112f..9894c7f 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, + { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, + { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +-- +1.7.10.4 + +From c1e5704657315b436c0409e8172c1fcb76adccad Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:06:27 +0100 +Subject: [PATCH] shared: add is_efiboot() + +--- + src/shared/util.c | 4 ++++ + src/shared/util.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 2a8afae..9983695 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -77,6 +77,10 @@ char **saved_argv = NULL; + static volatile unsigned cached_columns = 0; + static volatile unsigned cached_lines = 0; + ++bool is_efiboot(void) { ++ return access("/sys/firmware/efi", F_OK) >= 0; ++} ++ + size_t page_size(void) { + static __thread size_t pgsz = 0; + long r; +diff --git a/src/shared/util.h b/src/shared/util.h +index e387b12..99972cc 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -90,6 +90,8 @@ union dirent_storage { + #define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m" + #define ANSI_HIGHLIGHT_OFF "\x1B[0m" + ++bool is_efiboot(void); ++ + usec_t now(clockid_t clock); + + dual_timestamp* dual_timestamp_get(dual_timestamp *ts); +-- +1.7.10.4 + +From 1022373284b7562431fb0a6dba45db8af089a0e3 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:54:19 +0100 +Subject: [PATCH] kmod-setup: add conditional module loading callback + +--- + src/core/kmod-setup.c | 32 ++++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index ce8a8e7..383a6b2 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -30,11 +30,17 @@ + + #include "kmod-setup.h" + +-static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "efivarfs", "/sys/firmware/efi/efivars", +- "unix", "/proc/net/unix" ++typedef struct Kmodule { ++ const char *name; ++ const char *directory; ++ bool (*condition_fn)(void); ++} KModule; ++ ++static const KModule kmod_table[] = { ++ { "autofs4", "/sys/class/misc/autofs", NULL } , ++ { "ipv6", "/sys/module/ipv6", NULL }, ++ { "efivarfs", "/sys/firmware/efi/efivars", NULL }, ++ { "unix", "/proc/net/unix", NULL } , + }; + + #pragma GCC diagnostic push +@@ -42,7 +48,8 @@ static const char * const kmod_table[] = { + static void systemd_kmod_log(void *data, int priority, const char *file, int line, + const char *fn, const char *format, va_list args) + { +- log_metav(priority, file, line, fn, format, args); ++ /* library logging is enabled at debug only */ ++ log_metav(LOG_DEBUG, file, line, fn, format, args); + } + #pragma GCC diagnostic pop + +@@ -53,13 +60,15 @@ int kmod_setup(void) { + int err; + + for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) { ++ if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn()) ++ continue; + +- if (access(kmod_table[i+1], F_OK) >= 0) ++ if (access(kmod_table[i].directory, F_OK) >= 0) + continue; + + log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. " + "We'll now try to work around this by loading the module...", +- kmod_table[i]); ++ kmod_table[i].name); + + if (!ctx) { + ctx = kmod_new(NULL, NULL); +@@ -69,13 +78,12 @@ int kmod_setup(void) { + } + + kmod_set_log_fn(ctx, systemd_kmod_log, NULL); +- + kmod_load_resources(ctx); + } + +- err = kmod_module_new_from_name(ctx, kmod_table[i], &mod); ++ err = kmod_module_new_from_name(ctx, kmod_table[i].name, &mod); + if (err < 0) { +- log_error("Failed to load module '%s'", kmod_table[i]); ++ log_error("Failed to lookup module '%s'", kmod_table[i].name); + continue; + } + +@@ -85,7 +93,7 @@ int kmod_setup(void) { + else if (err == KMOD_PROBE_APPLY_BLACKLIST) + log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); + else +- log_error("Failed to insert '%s'", kmod_module_get_name(mod)); ++ log_error("Failed to insert module '%s'", kmod_module_get_name(mod)); + + kmod_module_unref(mod); + } +-- +1.7.10.4 + +From 3dfb265083347cb5700dc38f7cc0f479f378e6e9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:55:23 +0100 +Subject: [PATCH] kmod-setup: mounting efivarfs, *after* we tried to mount it, + is pointless + +The mount() system call, which we issue before loading modules, will trigger +a modprobe by the kernel and block until it returns. Trying to load it again +later, will have exactly the same result as the first time. +--- + src/core/kmod-setup.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 383a6b2..20ab232 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -39,7 +39,6 @@ typedef struct Kmodule { + static const KModule kmod_table[] = { + { "autofs4", "/sys/class/misc/autofs", NULL } , + { "ipv6", "/sys/module/ipv6", NULL }, +- { "efivarfs", "/sys/firmware/efi/efivars", NULL }, + { "unix", "/proc/net/unix", NULL } , + }; + +-- +1.7.10.4 + +From 6aa220e019f9dffd96590b06b68f937985204109 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 17:03:48 +0100 +Subject: [PATCH] mount-setup: try mounting 'efivarfs' only if the system + bootet with EFI + +--- + TODO | 3 --- + src/core/mount-setup.c | 50 ++++++++++++++++++++++++++++++++---------------- + 2 files changed, 34 insertions(+), 19 deletions(-) + +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 9894c7f..98614d0 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -46,14 +46,20 @@ + #define TTY_GID 5 + #endif + ++typedef enum MountMode { ++ MNT_NONE = 0, ++ MNT_FATAL = 1 << 0, ++ MNT_IN_CONTAINER = 1 << 1, ++} MountMode; ++ + typedef struct MountPoint { + const char *what; + const char *where; + const char *type; + const char *options; + unsigned long flags; +- bool fatal; +- bool in_container; ++ bool (*condition_fn)(void); ++ MountMode mode; + } MountPoint; + + /* The first three entries we might need before SELinux is up. The +@@ -62,16 +68,26 @@ typedef struct MountPoint { + #define N_EARLY_MOUNT 4 + + static const MountPoint mount_table[] = { +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, +- { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, +- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, false, true }, +- { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, true }, ++ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_NONE }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ is_efiboot, MNT_NONE }, ++ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, ++ NULL, MNT_IN_CONTAINER }, ++ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_IN_CONTAINER }, ++ { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_IN_CONTAINER }, + }; + + /* These are API file systems that might be mounted by other software, +@@ -119,6 +135,9 @@ static int mount_one(const MountPoint *p, bool relabel) { + + assert(p); + ++ if (p->condition_fn && !p->condition_fn()) ++ return 0; ++ + /* Relabel first, just in case */ + if (relabel) + label_fix(p->where, true, true); +@@ -131,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) { + return 0; + + /* Skip securityfs in a container */ +- if (!p->in_container && detect_container(NULL) > 0) ++ if (!(p->mode & MNT_IN_CONTAINER) && detect_container(NULL) > 0) + return 0; + + /* The access mode here doesn't really matter too much, since +@@ -149,8 +168,8 @@ static int mount_one(const MountPoint *p, bool relabel) { + p->type, + p->flags, + p->options) < 0) { +- log_full(p->fatal ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); +- return p->fatal ? -errno : 0; ++ log_full((p->mode & MNT_FATAL) ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); ++ return (p->mode & MNT_FATAL) ? -errno : 0; + } + + /* Relabel again, since we now mounted something fresh here */ +@@ -289,7 +308,6 @@ int mount_cgroup_controllers(char ***join_controllers) { + p.type = "cgroup"; + p.options = options; + p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV; +- p.fatal = false; + + r = mount_one(&p, true); + free(controller); +-- +1.7.10.4 + Index: sync-on-shutdown.patch =================================================================== --- sync-on-shutdown.patch (added) +++ sync-on-shutdown.patch (revision 5) @@ -0,0 +1,49 @@ +From 0049f05a8bb82c3e084bacc5945596761d706c55 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 16 Nov 2012 01:30:29 +0100 +Subject: [PATCH] shutdown: readd explicit sync() when shutting down + +As it turns out reboot() doesn't actually imply a file system sync, but +only a disk sync. Accordingly, readd explicit sync() invocations +immediately before we invoke reboot(). + +This is much less dramatic than it might sounds as we umount all +disks/read-only remount them anyway before going down. +--- + src/core/service.c | 1 + + src/core/shutdown.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/core/service.c b/src/core/service.c +index cf08485..df72aba 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2485,6 +2485,7 @@ static int service_start_limit_test(Service *s) { + + case SERVICE_START_LIMIT_REBOOT_IMMEDIATE: + log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id); ++ sync(); + reboot(RB_AUTOBOOT); + break; + +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index cc8c57b..b59aef1 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -273,6 +273,13 @@ int main(int argc, char *argv[]) { + } + } + ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. So let's do this here, but not ++ * needlessly slow down containers. */ ++ if (!in_container) ++ sync(); ++ + if (cmd == LINUX_REBOOT_CMD_KEXEC) { + + if (!in_container) { +-- +1.7.10.4 + Index: systemd-journald.init =================================================================== --- systemd-journald.init (added) +++ systemd-journald.init (revision 5) @@ -0,0 +1,33 @@ +#! /bin/sh +# +# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# /etc/init.d/systemd-journald +# +### BEGIN INIT INFO +# Provides: syslog +# Required-Start: $null +# Required-Stop: $null +# Default-Start: 2 3 5 +# Default-Stop: +# Short-Description: compat wrapper for journald +# Description: compat wrapper for journald +### END INIT INFO + +. /etc/rc.status + +rc_reset + +case "$1" in + start|stop|restart) + rc_failed 3 + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +rc_exit Index: xdm-display-manager.patch =================================================================== --- xdm-display-manager.patch (added) +++ xdm-display-manager.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-195/units/graphical.target +=================================================================== +--- systemd-195.orig/units/graphical.target ++++ systemd-195/units/graphical.target +@@ -11,7 +11,7 @@ Documentation=man:systemd.special(7) + Requires=multi-user.target + After=multi-user.target + Conflicts=rescue.target +-Wants=display-manager.service ++Wants=xdm.service + AllowIsolate=yes + + [Install] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=312
2012-11-20 13:10:12 +01:00
%if ! 0%{?bootstrap}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
install -m755 -D %{S:8} %{buildroot}/etc/init.d/systemd-journald
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
install -D -m 755 %{S:9} %{buildroot}%{_sbindir}/nss-myhostname-config
- links more manpages for migrated tools (from Christopher Yeleighton). - disable boot.localnet service, ypbind service will do the right thing now (bnc#716746) - add xdm-display-manager.patch: pull xdm.service instead of display-manager.service (needed until xdm initscript is migrated to native systemd service). - Add fix-permissions-btmp.patch: ensure btmp is owned only by root (bnc#777405). - Have the udev package create a tape group, as referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules (DimStar). - Add fix-bad-memory-access.patch: fix crash in journal rotation. - Add fix-dbus-crash.patch: fix D-Bus caused crash. - Add sync-on-shutdown.patch: ensure sync is done when initiating shutdown. - Add mount-efivars.patch: mount efivars if booting on UEFI. - Ship a empty systemd-journald initscript in systemd-logger to stop insserv to complain about missing syslog dependency. - Update 0001-service-Fix-dependencies-added-when-parsing-insserv..patch with bug fixes from Debian. old: Base:System/systemd new: home:fcrozat:branches:Base:System/systemd rev NoneIndex: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch =================================================================== --- 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 311) +++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 5) @@ -1,17 +1,35 @@ -From 6620bceb7233a830be3635a4f7a7dc75c13a9c8e Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Fri, 30 Sep 2011 14:12:45 +0200 -Subject: [PATCH] service: Fix dependencies added when parsing insserv.conf - ---- - src/service.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -Index: systemd-41/src/service.c +Index: systemd-195/src/core/service.c =================================================================== ---- systemd-41.orig/src/core/service.c -+++ systemd-41/src/core/service.c -@@ -3210,23 +3210,30 @@ static void sysv_facility_in_insserv_con +--- systemd-195.orig/src/core/service.c ++++ systemd-195/src/core/service.c +@@ -3391,12 +3391,13 @@ static void service_notify_message(Unit + + #ifdef HAVE_SYSV_COMPAT + +-#ifdef TARGET_SUSE +-static void sysv_facility_in_insserv_conf(Manager *mgr) { +- FILE *f=NULL; ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) ++static void sysv_parse_insserv_conf(Manager *mgr, const char* filename) { ++ FILE *f = NULL; + int r; + +- if (!(f = fopen("/etc/insserv.conf", "re"))) { ++ if (!(f = fopen(filename, "re"))) { ++ log_error("Failed to open file %s", filename); + r = errno == ENOENT ? 0 : -errno; + goto finish; + } +@@ -3410,7 +3411,7 @@ static void sysv_facility_in_insserv_con + break; + + r = -errno; +- log_error("Failed to read configuration file '/etc/insserv.conf': %s", strerror(-r)); ++ log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); + goto finish; + } + +@@ -3425,23 +3426,30 @@ static void sysv_facility_in_insserv_con Unit *u; if (sysv_translate_facility(parsed[0], NULL, &facility) < 0) continue; @@ -29,12 +47,12 @@ STRV_FOREACH (j, parsed+1) { - if (*j[0]=='+') { - e = UNIT_WANTS; -+ if (*j[0]=='+') ++ if (*j[0] == '+') name = *j+1; - } - else { - e = UNIT_REQUIRES; -+ else ++ else name = *j; - } + if (streq(name, "boot.localfs") || @@ -44,9 +62,54 @@ continue; - r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, e, dep, NULL, true); -+ r = unit_add_dependency_by_name_inverse(u, UNIT_BEFORE, dep, NULL, true); -+ if (*j[0]!='+') ++ r = unit_add_two_dependencies_by_name_inverse(u, UNIT_WANTS, UNIT_BEFORE, dep, NULL, true); ++ if (*j[0] != '+') + r = unit_add_dependency_by_name(u, UNIT_REQUIRES, dep, NULL, true); free(dep); } } +@@ -3454,6 +3462,35 @@ finish: + fclose(f); + + } ++ ++static void sysv_facility_in_insserv_conf(Manager *mgr) { ++ DIR *d =NULL; ++ struct dirent *de; ++ ++#ifdef TARGET_DEBIAN ++ if (!(d = opendir("/etc/insserv.conf.d/"))) ++ if (errno != ENOENT) { ++ log_warning("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); ++ goto finish; ++ } ++ ++ while ((de = readdir(d))) { ++ char *path = NULL; ++ if (ignore_file(de->d_name)) ++ continue; ++ ++ path = join("/etc/insserv.conf.d/", de->d_name, NULL); ++ sysv_parse_insserv_conf(mgr, path); ++ free(path); ++ } ++finish: ++ if (d) ++ closedir(d); ++#endif ++ ++ sysv_parse_insserv_conf(mgr, "/etc/insserv.conf"); ++} ++ + #endif + + static int service_enumerate(Manager *m) { +@@ -3604,7 +3641,7 @@ static int service_enumerate(Manager *m) + + r = 0; + +-#ifdef TARGET_SUSE ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) + sysv_facility_in_insserv_conf (m); + #endif + Index: systemd-mini.changes =================================================================== --- systemd-mini.changes (revision 311) +++ systemd-mini.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd-mini.spec =================================================================== --- systemd-mini.spec (revision 311) +++ systemd-mini.spec (revision 5) @@ -102,6 +102,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -128,6 +129,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -137,6 +140,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -151,8 +162,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -313,6 +322,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -337,6 +347,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -368,8 +384,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -378,11 +400,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -392,7 +409,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -415,8 +432,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -442,8 +458,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -532,6 +552,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -724,6 +746,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -787,7 +813,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -878,6 +908,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: systemd.changes =================================================================== --- systemd.changes (revision 311) +++ systemd.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd.spec =================================================================== --- systemd.spec (revision 311) +++ systemd.spec (revision 5) @@ -97,6 +97,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -123,6 +124,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -132,6 +135,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -146,8 +157,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -308,6 +317,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -332,6 +342,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -363,8 +379,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -373,11 +395,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -387,7 +404,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -410,8 +427,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -437,8 +453,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -527,6 +547,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -719,6 +741,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -782,7 +808,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -873,6 +903,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: fix-bad-memory-access.patch =================================================================== --- fix-bad-memory-access.patch (added) +++ fix-bad-memory-access.patch (revision 5) @@ -0,0 +1,23 @@ +From 7d73c1343be02a59b17de0cd34375deeb815d89c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 20 Nov 2012 00:19:27 +0100 +Subject: [PATCH] journald: fix bad memory access + +https://bugzilla.redhat.com/show_bug.cgi?id=875653 +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: systemd-195/src/journal/journald.c +=================================================================== +--- systemd-195.orig/src/journal/journald.c ++++ systemd-195/src/journal/journald.c +@@ -342,7 +342,7 @@ static void server_rotate(Server *s) { + HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { + r = journal_file_rotate(&f, s->compress, s->seal); + if (r < 0) +- if (f->path) ++ if (f) + log_error("Failed to rotate %s: %s", f->path, strerror(-r)); + else + log_error("Failed to create user journal: %s", strerror(-r)); Index: fix-dbus-crash.patch =================================================================== --- fix-dbus-crash.patch (added) +++ fix-dbus-crash.patch (revision 5) @@ -0,0 +1,32 @@ +From 645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Wed, 31 Oct 2012 11:53:56 +0100 +Subject: [PATCH] dbus-manager: fix a fatal dbus abort in + bus_manager_message_handler() + +If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref() +will be called twice on "reply", causing systemd to crash. So remove +the call to dbus_message_unref(); it is unnecessary because of +the cleanup attribute on "reply". + +[zj: modified to leave one dbus_message_unref() alone, per Colin +Walters' comment.] +--- + src/core/dbus-manager.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index 2010241..3cf3e90 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -1436,7 +1436,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h); + if (r < 0) { + unit_file_list_free(h); +- dbus_message_unref(reply); + return bus_send_error_reply(connection, message, NULL, r); + } + +-- +1.7.10.4 + Index: fix-permissions-btmp.patch =================================================================== --- fix-permissions-btmp.patch (added) +++ fix-permissions-btmp.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-44/tmpfiles.d/systemd.conf +=================================================================== +--- systemd-44.orig/tmpfiles.d/systemd.conf ++++ systemd-44/tmpfiles.d/systemd.conf +@@ -11,7 +11,7 @@ d /run/user 0755 root root 10d + F /run/utmp 0664 root utmp - + + f /var/log/wtmp 0664 root utmp - +-f /var/log/btmp 0600 root utmp - ++f /var/log/btmp 0600 root root - + + d /var/cache/man - - - 30d + Index: mount-efivars.patch =================================================================== --- mount-efivars.patch (added) +++ mount-efivars.patch (revision 5) @@ -0,0 +1,336 @@ +From f271dd97622b656c1c013d181ea615c671cc2438 Mon Sep 17 00:00:00 2001 +From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> +Date: Sat, 27 Oct 2012 11:23:22 +0800 +Subject: [PATCH] systemd: mount the EFI variable filesystem +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add efivarfs to the mount_table in mount-setup.c, so the EFI variable +filesystem will be mounted when systemd executed. + +The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel. + +Cc: Kay Sievers <kay@vrfy.org> +Cc: Lennart Poettering <lennart@poettering.net> +Cc: Mantas Mikulėnas <grawity@gmail.com> +Cc: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> +Cc: Matt Fleming <matt.fleming@intel.com> +Cc: Jeremy Kerr <jeremy.kerr@canonical.com> +Cc: Matthew Garrett <mjg@redhat.com> +Signed-off-by: Lee, Chun-Yi <jlee@suse.com> +--- + src/core/kmod-setup.c | 7 ++++--- + src/core/mount-setup.c | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index cc2a2d9..ce8a8e7 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -31,9 +31,10 @@ + #include "kmod-setup.h" + + static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "unix", "/proc/net/unix" ++ "autofs4", "/sys/class/misc/autofs", ++ "ipv6", "/sys/module/ipv6", ++ "efivarfs", "/sys/firmware/efi/efivars", ++ "unix", "/proc/net/unix" + }; + + #pragma GCC diagnostic push +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 0fd112f..9894c7f 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, + { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, + { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +-- +1.7.10.4 + +From c1e5704657315b436c0409e8172c1fcb76adccad Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:06:27 +0100 +Subject: [PATCH] shared: add is_efiboot() + +--- + src/shared/util.c | 4 ++++ + src/shared/util.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 2a8afae..9983695 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -77,6 +77,10 @@ char **saved_argv = NULL; + static volatile unsigned cached_columns = 0; + static volatile unsigned cached_lines = 0; + ++bool is_efiboot(void) { ++ return access("/sys/firmware/efi", F_OK) >= 0; ++} ++ + size_t page_size(void) { + static __thread size_t pgsz = 0; + long r; +diff --git a/src/shared/util.h b/src/shared/util.h +index e387b12..99972cc 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -90,6 +90,8 @@ union dirent_storage { + #define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m" + #define ANSI_HIGHLIGHT_OFF "\x1B[0m" + ++bool is_efiboot(void); ++ + usec_t now(clockid_t clock); + + dual_timestamp* dual_timestamp_get(dual_timestamp *ts); +-- +1.7.10.4 + +From 1022373284b7562431fb0a6dba45db8af089a0e3 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:54:19 +0100 +Subject: [PATCH] kmod-setup: add conditional module loading callback + +--- + src/core/kmod-setup.c | 32 ++++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index ce8a8e7..383a6b2 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -30,11 +30,17 @@ + + #include "kmod-setup.h" + +-static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "efivarfs", "/sys/firmware/efi/efivars", +- "unix", "/proc/net/unix" ++typedef struct Kmodule { ++ const char *name; ++ const char *directory; ++ bool (*condition_fn)(void); ++} KModule; ++ ++static const KModule kmod_table[] = { ++ { "autofs4", "/sys/class/misc/autofs", NULL } , ++ { "ipv6", "/sys/module/ipv6", NULL }, ++ { "efivarfs", "/sys/firmware/efi/efivars", NULL }, ++ { "unix", "/proc/net/unix", NULL } , + }; + + #pragma GCC diagnostic push +@@ -42,7 +48,8 @@ static const char * const kmod_table[] = { + static void systemd_kmod_log(void *data, int priority, const char *file, int line, + const char *fn, const char *format, va_list args) + { +- log_metav(priority, file, line, fn, format, args); ++ /* library logging is enabled at debug only */ ++ log_metav(LOG_DEBUG, file, line, fn, format, args); + } + #pragma GCC diagnostic pop + +@@ -53,13 +60,15 @@ int kmod_setup(void) { + int err; + + for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) { ++ if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn()) ++ continue; + +- if (access(kmod_table[i+1], F_OK) >= 0) ++ if (access(kmod_table[i].directory, F_OK) >= 0) + continue; + + log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. " + "We'll now try to work around this by loading the module...", +- kmod_table[i]); ++ kmod_table[i].name); + + if (!ctx) { + ctx = kmod_new(NULL, NULL); +@@ -69,13 +78,12 @@ int kmod_setup(void) { + } + + kmod_set_log_fn(ctx, systemd_kmod_log, NULL); +- + kmod_load_resources(ctx); + } + +- err = kmod_module_new_from_name(ctx, kmod_table[i], &mod); ++ err = kmod_module_new_from_name(ctx, kmod_table[i].name, &mod); + if (err < 0) { +- log_error("Failed to load module '%s'", kmod_table[i]); ++ log_error("Failed to lookup module '%s'", kmod_table[i].name); + continue; + } + +@@ -85,7 +93,7 @@ int kmod_setup(void) { + else if (err == KMOD_PROBE_APPLY_BLACKLIST) + log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); + else +- log_error("Failed to insert '%s'", kmod_module_get_name(mod)); ++ log_error("Failed to insert module '%s'", kmod_module_get_name(mod)); + + kmod_module_unref(mod); + } +-- +1.7.10.4 + +From 3dfb265083347cb5700dc38f7cc0f479f378e6e9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:55:23 +0100 +Subject: [PATCH] kmod-setup: mounting efivarfs, *after* we tried to mount it, + is pointless + +The mount() system call, which we issue before loading modules, will trigger +a modprobe by the kernel and block until it returns. Trying to load it again +later, will have exactly the same result as the first time. +--- + src/core/kmod-setup.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 383a6b2..20ab232 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -39,7 +39,6 @@ typedef struct Kmodule { + static const KModule kmod_table[] = { + { "autofs4", "/sys/class/misc/autofs", NULL } , + { "ipv6", "/sys/module/ipv6", NULL }, +- { "efivarfs", "/sys/firmware/efi/efivars", NULL }, + { "unix", "/proc/net/unix", NULL } , + }; + +-- +1.7.10.4 + +From 6aa220e019f9dffd96590b06b68f937985204109 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 17:03:48 +0100 +Subject: [PATCH] mount-setup: try mounting 'efivarfs' only if the system + bootet with EFI + +--- + TODO | 3 --- + src/core/mount-setup.c | 50 ++++++++++++++++++++++++++++++++---------------- + 2 files changed, 34 insertions(+), 19 deletions(-) + +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 9894c7f..98614d0 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -46,14 +46,20 @@ + #define TTY_GID 5 + #endif + ++typedef enum MountMode { ++ MNT_NONE = 0, ++ MNT_FATAL = 1 << 0, ++ MNT_IN_CONTAINER = 1 << 1, ++} MountMode; ++ + typedef struct MountPoint { + const char *what; + const char *where; + const char *type; + const char *options; + unsigned long flags; +- bool fatal; +- bool in_container; ++ bool (*condition_fn)(void); ++ MountMode mode; + } MountPoint; + + /* The first three entries we might need before SELinux is up. The +@@ -62,16 +68,26 @@ typedef struct MountPoint { + #define N_EARLY_MOUNT 4 + + static const MountPoint mount_table[] = { +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, +- { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, +- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, false, true }, +- { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, true }, ++ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_NONE }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ is_efiboot, MNT_NONE }, ++ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, ++ NULL, MNT_IN_CONTAINER }, ++ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_IN_CONTAINER }, ++ { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_IN_CONTAINER }, + }; + + /* These are API file systems that might be mounted by other software, +@@ -119,6 +135,9 @@ static int mount_one(const MountPoint *p, bool relabel) { + + assert(p); + ++ if (p->condition_fn && !p->condition_fn()) ++ return 0; ++ + /* Relabel first, just in case */ + if (relabel) + label_fix(p->where, true, true); +@@ -131,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) { + return 0; + + /* Skip securityfs in a container */ +- if (!p->in_container && detect_container(NULL) > 0) ++ if (!(p->mode & MNT_IN_CONTAINER) && detect_container(NULL) > 0) + return 0; + + /* The access mode here doesn't really matter too much, since +@@ -149,8 +168,8 @@ static int mount_one(const MountPoint *p, bool relabel) { + p->type, + p->flags, + p->options) < 0) { +- log_full(p->fatal ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); +- return p->fatal ? -errno : 0; ++ log_full((p->mode & MNT_FATAL) ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); ++ return (p->mode & MNT_FATAL) ? -errno : 0; + } + + /* Relabel again, since we now mounted something fresh here */ +@@ -289,7 +308,6 @@ int mount_cgroup_controllers(char ***join_controllers) { + p.type = "cgroup"; + p.options = options; + p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV; +- p.fatal = false; + + r = mount_one(&p, true); + free(controller); +-- +1.7.10.4 + Index: sync-on-shutdown.patch =================================================================== --- sync-on-shutdown.patch (added) +++ sync-on-shutdown.patch (revision 5) @@ -0,0 +1,49 @@ +From 0049f05a8bb82c3e084bacc5945596761d706c55 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 16 Nov 2012 01:30:29 +0100 +Subject: [PATCH] shutdown: readd explicit sync() when shutting down + +As it turns out reboot() doesn't actually imply a file system sync, but +only a disk sync. Accordingly, readd explicit sync() invocations +immediately before we invoke reboot(). + +This is much less dramatic than it might sounds as we umount all +disks/read-only remount them anyway before going down. +--- + src/core/service.c | 1 + + src/core/shutdown.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/core/service.c b/src/core/service.c +index cf08485..df72aba 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2485,6 +2485,7 @@ static int service_start_limit_test(Service *s) { + + case SERVICE_START_LIMIT_REBOOT_IMMEDIATE: + log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id); ++ sync(); + reboot(RB_AUTOBOOT); + break; + +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index cc8c57b..b59aef1 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -273,6 +273,13 @@ int main(int argc, char *argv[]) { + } + } + ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. So let's do this here, but not ++ * needlessly slow down containers. */ ++ if (!in_container) ++ sync(); ++ + if (cmd == LINUX_REBOOT_CMD_KEXEC) { + + if (!in_container) { +-- +1.7.10.4 + Index: systemd-journald.init =================================================================== --- systemd-journald.init (added) +++ systemd-journald.init (revision 5) @@ -0,0 +1,33 @@ +#! /bin/sh +# +# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# /etc/init.d/systemd-journald +# +### BEGIN INIT INFO +# Provides: syslog +# Required-Start: $null +# Required-Stop: $null +# Default-Start: 2 3 5 +# Default-Stop: +# Short-Description: compat wrapper for journald +# Description: compat wrapper for journald +### END INIT INFO + +. /etc/rc.status + +rc_reset + +case "$1" in + start|stop|restart) + rc_failed 3 + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +rc_exit Index: xdm-display-manager.patch =================================================================== --- xdm-display-manager.patch (added) +++ xdm-display-manager.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-195/units/graphical.target +=================================================================== +--- systemd-195.orig/units/graphical.target ++++ systemd-195/units/graphical.target +@@ -11,7 +11,7 @@ Documentation=man:systemd.special(7) + Requires=multi-user.target + After=multi-user.target + Conflicts=rescue.target +-Wants=display-manager.service ++Wants=xdm.service + AllowIsolate=yes + + [Install] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=312
2012-11-20 13:10:12 +01:00
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
- make 'reload' and 'force-reload' LSB compliant (bnc#793936). - make 'reload' and 'force-reload' LSB compliant (bnc#793936). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=325
2013-01-08 14:29:03 +01:00
sed -ie "s|@@PREFIX@@|%{_prefix}/lib/udev|g" %{S:1060}
sed -ie "s|@@SYSTEMD@@|%{_prefix}/lib/systemd|g" %{S:1060}
sed -ie "s|@@BINDIR@@|%{_bindir}|g" %{S:1060}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
install -m755 -D %{S:1060} %{buildroot}/etc/init.d/boot.udev
ln -s systemd-udevd.service %{buildroot}/%{_prefix}/lib/systemd/system/udev.service
- Rename (fix typo in script name): udev-generate-peristent-rule.sh to udev-generate-persistent-rule.sh - Rename (fix typo in script name): udev-generate-peristent-rule.sh to udev-generate-persistent-rule.sh OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=728
2014-07-24 11:03:14 +02:00
install -m755 -D %{S:1063} %{buildroot}/%{_prefix}/lib/udev/udev-generate-persistent-rule
add feature 316824 and address bug 869142 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=573
2014-03-25 14:47:22 +01:00
install -m755 -D %{S:1064} %{buildroot}/%{_bindir}/systemd-sleep-grub
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=715
2014-07-14 17:05:04 +02:00
install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=820
2014-11-20 13:20:19 +01:00
mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system/basic.target.wants
Reduce build time dependencies OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=398
2013-06-19 09:04:23 +02:00
rm -rf %{buildroot}%{_sysconfdir}/rpm
- Create getty@tty1.service to restore traditional SUSE behavior of not clearing tty1. (bnc#804158) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=350
2013-02-18 17:15:49 +01:00
find %{buildroot} -type f -name '*.la' -delete
- Ensure /usr/lib/systemd/system/shutdown.target.wants is created and owned by systemd package. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=419
2013-08-01 18:06:31 +02:00
mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants,system/shutdown.target.wants}
- Add fix-dir-noatime-tmpfiles.patch: do not modify directory atime, which was preventing removing empty directories (bnc#751253, rh#810257). - Add improve-restart-behaviour.patch: prevent deadlock during try-restart (bnc#743218). - Add journal-bugfixes.patch: don't crash when rotating journal (bnc#768953) and prevent memleak at rotation time too. - Add ulimit-support.patch: add support for system wide ulimit (bnc#744818). - Add change-terminal.patch: use vt102 instead of vt100 as terminal for non-vc tty. - Package various .wants directories, which were no longer packaged due to plymouth units being removed from systemd package. - Fix buildrequires for manpages build. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=284
2012-07-03 18:31:03 +02:00
- Handle disable_capslock, compose table and kbd_rate - Add rpm macros.systemd file. - Do not disable klogd, it has its own service now. - Handle kexec correctly (bnc#671673). - Disable preload services, they are conflicting with systemd. >>>>>>> .new OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=181
2011-08-23 18:14:51 +02:00
install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd
ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init
ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot
ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt
ln -s ../usr/bin/systemctl %{buildroot}/sbin/shutdown
ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff
ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit
ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel
- Use RPM macros instead of $RPM_FOO variables - Don't require %{version}-%{release} of the base package, %{version} is sufficient OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=155
2011-06-15 12:09:00 +02:00
rm -rf %{buildroot}/etc/systemd/system/*.target.wants
rm -f %{buildroot}/etc/systemd/system/default.target
version 28 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=150
2011-05-27 02:01:07 +02:00
# aliases for /etc/init.d/*
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/cgroup.service
ln -s systemd-tmpfiles-setup.service %{buildroot}/%{_prefix}/lib/systemd/system/cleanup.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/clock.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/crypto.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/crypto-early.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/device-mapper.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/earlysyslog.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/kbd.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service
install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service
- links more manpages for migrated tools (from Christopher Yeleighton). - disable boot.localnet service, ypbind service will do the right thing now (bnc#716746) - add xdm-display-manager.patch: pull xdm.service instead of display-manager.service (needed until xdm initscript is migrated to native systemd service). - Add fix-permissions-btmp.patch: ensure btmp is owned only by root (bnc#777405). - Have the udev package create a tape group, as referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules (DimStar). - Add fix-bad-memory-access.patch: fix crash in journal rotation. - Add fix-dbus-crash.patch: fix D-Bus caused crash. - Add sync-on-shutdown.patch: ensure sync is done when initiating shutdown. - Add mount-efivars.patch: mount efivars if booting on UEFI. - Ship a empty systemd-journald initscript in systemd-logger to stop insserv to complain about missing syslog dependency. - Update 0001-service-Fix-dependencies-added-when-parsing-insserv..patch with bug fixes from Debian. old: Base:System/systemd new: home:fcrozat:branches:Base:System/systemd rev NoneIndex: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch =================================================================== --- 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 311) +++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 5) @@ -1,17 +1,35 @@ -From 6620bceb7233a830be3635a4f7a7dc75c13a9c8e Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Fri, 30 Sep 2011 14:12:45 +0200 -Subject: [PATCH] service: Fix dependencies added when parsing insserv.conf - ---- - src/service.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -Index: systemd-41/src/service.c +Index: systemd-195/src/core/service.c =================================================================== ---- systemd-41.orig/src/core/service.c -+++ systemd-41/src/core/service.c -@@ -3210,23 +3210,30 @@ static void sysv_facility_in_insserv_con +--- systemd-195.orig/src/core/service.c ++++ systemd-195/src/core/service.c +@@ -3391,12 +3391,13 @@ static void service_notify_message(Unit + + #ifdef HAVE_SYSV_COMPAT + +-#ifdef TARGET_SUSE +-static void sysv_facility_in_insserv_conf(Manager *mgr) { +- FILE *f=NULL; ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) ++static void sysv_parse_insserv_conf(Manager *mgr, const char* filename) { ++ FILE *f = NULL; + int r; + +- if (!(f = fopen("/etc/insserv.conf", "re"))) { ++ if (!(f = fopen(filename, "re"))) { ++ log_error("Failed to open file %s", filename); + r = errno == ENOENT ? 0 : -errno; + goto finish; + } +@@ -3410,7 +3411,7 @@ static void sysv_facility_in_insserv_con + break; + + r = -errno; +- log_error("Failed to read configuration file '/etc/insserv.conf': %s", strerror(-r)); ++ log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); + goto finish; + } + +@@ -3425,23 +3426,30 @@ static void sysv_facility_in_insserv_con Unit *u; if (sysv_translate_facility(parsed[0], NULL, &facility) < 0) continue; @@ -29,12 +47,12 @@ STRV_FOREACH (j, parsed+1) { - if (*j[0]=='+') { - e = UNIT_WANTS; -+ if (*j[0]=='+') ++ if (*j[0] == '+') name = *j+1; - } - else { - e = UNIT_REQUIRES; -+ else ++ else name = *j; - } + if (streq(name, "boot.localfs") || @@ -44,9 +62,54 @@ continue; - r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, e, dep, NULL, true); -+ r = unit_add_dependency_by_name_inverse(u, UNIT_BEFORE, dep, NULL, true); -+ if (*j[0]!='+') ++ r = unit_add_two_dependencies_by_name_inverse(u, UNIT_WANTS, UNIT_BEFORE, dep, NULL, true); ++ if (*j[0] != '+') + r = unit_add_dependency_by_name(u, UNIT_REQUIRES, dep, NULL, true); free(dep); } } +@@ -3454,6 +3462,35 @@ finish: + fclose(f); + + } ++ ++static void sysv_facility_in_insserv_conf(Manager *mgr) { ++ DIR *d =NULL; ++ struct dirent *de; ++ ++#ifdef TARGET_DEBIAN ++ if (!(d = opendir("/etc/insserv.conf.d/"))) ++ if (errno != ENOENT) { ++ log_warning("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); ++ goto finish; ++ } ++ ++ while ((de = readdir(d))) { ++ char *path = NULL; ++ if (ignore_file(de->d_name)) ++ continue; ++ ++ path = join("/etc/insserv.conf.d/", de->d_name, NULL); ++ sysv_parse_insserv_conf(mgr, path); ++ free(path); ++ } ++finish: ++ if (d) ++ closedir(d); ++#endif ++ ++ sysv_parse_insserv_conf(mgr, "/etc/insserv.conf"); ++} ++ + #endif + + static int service_enumerate(Manager *m) { +@@ -3604,7 +3641,7 @@ static int service_enumerate(Manager *m) + + r = 0; + +-#ifdef TARGET_SUSE ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) + sysv_facility_in_insserv_conf (m); + #endif + Index: systemd-mini.changes =================================================================== --- systemd-mini.changes (revision 311) +++ systemd-mini.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd-mini.spec =================================================================== --- systemd-mini.spec (revision 311) +++ systemd-mini.spec (revision 5) @@ -102,6 +102,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -128,6 +129,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -137,6 +140,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -151,8 +162,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -313,6 +322,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -337,6 +347,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -368,8 +384,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -378,11 +400,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -392,7 +409,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -415,8 +432,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -442,8 +458,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -532,6 +552,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -724,6 +746,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -787,7 +813,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -878,6 +908,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: systemd.changes =================================================================== --- systemd.changes (revision 311) +++ systemd.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd.spec =================================================================== --- systemd.spec (revision 311) +++ systemd.spec (revision 5) @@ -97,6 +97,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -123,6 +124,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -132,6 +135,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -146,8 +157,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -308,6 +317,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -332,6 +342,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -363,8 +379,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -373,11 +395,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -387,7 +404,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -410,8 +427,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -437,8 +453,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -527,6 +547,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -719,6 +741,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -782,7 +808,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -873,6 +903,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: fix-bad-memory-access.patch =================================================================== --- fix-bad-memory-access.patch (added) +++ fix-bad-memory-access.patch (revision 5) @@ -0,0 +1,23 @@ +From 7d73c1343be02a59b17de0cd34375deeb815d89c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 20 Nov 2012 00:19:27 +0100 +Subject: [PATCH] journald: fix bad memory access + +https://bugzilla.redhat.com/show_bug.cgi?id=875653 +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: systemd-195/src/journal/journald.c +=================================================================== +--- systemd-195.orig/src/journal/journald.c ++++ systemd-195/src/journal/journald.c +@@ -342,7 +342,7 @@ static void server_rotate(Server *s) { + HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { + r = journal_file_rotate(&f, s->compress, s->seal); + if (r < 0) +- if (f->path) ++ if (f) + log_error("Failed to rotate %s: %s", f->path, strerror(-r)); + else + log_error("Failed to create user journal: %s", strerror(-r)); Index: fix-dbus-crash.patch =================================================================== --- fix-dbus-crash.patch (added) +++ fix-dbus-crash.patch (revision 5) @@ -0,0 +1,32 @@ +From 645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Wed, 31 Oct 2012 11:53:56 +0100 +Subject: [PATCH] dbus-manager: fix a fatal dbus abort in + bus_manager_message_handler() + +If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref() +will be called twice on "reply", causing systemd to crash. So remove +the call to dbus_message_unref(); it is unnecessary because of +the cleanup attribute on "reply". + +[zj: modified to leave one dbus_message_unref() alone, per Colin +Walters' comment.] +--- + src/core/dbus-manager.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index 2010241..3cf3e90 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -1436,7 +1436,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h); + if (r < 0) { + unit_file_list_free(h); +- dbus_message_unref(reply); + return bus_send_error_reply(connection, message, NULL, r); + } + +-- +1.7.10.4 + Index: fix-permissions-btmp.patch =================================================================== --- fix-permissions-btmp.patch (added) +++ fix-permissions-btmp.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-44/tmpfiles.d/systemd.conf +=================================================================== +--- systemd-44.orig/tmpfiles.d/systemd.conf ++++ systemd-44/tmpfiles.d/systemd.conf +@@ -11,7 +11,7 @@ d /run/user 0755 root root 10d + F /run/utmp 0664 root utmp - + + f /var/log/wtmp 0664 root utmp - +-f /var/log/btmp 0600 root utmp - ++f /var/log/btmp 0600 root root - + + d /var/cache/man - - - 30d + Index: mount-efivars.patch =================================================================== --- mount-efivars.patch (added) +++ mount-efivars.patch (revision 5) @@ -0,0 +1,336 @@ +From f271dd97622b656c1c013d181ea615c671cc2438 Mon Sep 17 00:00:00 2001 +From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> +Date: Sat, 27 Oct 2012 11:23:22 +0800 +Subject: [PATCH] systemd: mount the EFI variable filesystem +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add efivarfs to the mount_table in mount-setup.c, so the EFI variable +filesystem will be mounted when systemd executed. + +The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel. + +Cc: Kay Sievers <kay@vrfy.org> +Cc: Lennart Poettering <lennart@poettering.net> +Cc: Mantas Mikulėnas <grawity@gmail.com> +Cc: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> +Cc: Matt Fleming <matt.fleming@intel.com> +Cc: Jeremy Kerr <jeremy.kerr@canonical.com> +Cc: Matthew Garrett <mjg@redhat.com> +Signed-off-by: Lee, Chun-Yi <jlee@suse.com> +--- + src/core/kmod-setup.c | 7 ++++--- + src/core/mount-setup.c | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index cc2a2d9..ce8a8e7 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -31,9 +31,10 @@ + #include "kmod-setup.h" + + static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "unix", "/proc/net/unix" ++ "autofs4", "/sys/class/misc/autofs", ++ "ipv6", "/sys/module/ipv6", ++ "efivarfs", "/sys/firmware/efi/efivars", ++ "unix", "/proc/net/unix" + }; + + #pragma GCC diagnostic push +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 0fd112f..9894c7f 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, + { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, + { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +-- +1.7.10.4 + +From c1e5704657315b436c0409e8172c1fcb76adccad Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:06:27 +0100 +Subject: [PATCH] shared: add is_efiboot() + +--- + src/shared/util.c | 4 ++++ + src/shared/util.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 2a8afae..9983695 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -77,6 +77,10 @@ char **saved_argv = NULL; + static volatile unsigned cached_columns = 0; + static volatile unsigned cached_lines = 0; + ++bool is_efiboot(void) { ++ return access("/sys/firmware/efi", F_OK) >= 0; ++} ++ + size_t page_size(void) { + static __thread size_t pgsz = 0; + long r; +diff --git a/src/shared/util.h b/src/shared/util.h +index e387b12..99972cc 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -90,6 +90,8 @@ union dirent_storage { + #define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m" + #define ANSI_HIGHLIGHT_OFF "\x1B[0m" + ++bool is_efiboot(void); ++ + usec_t now(clockid_t clock); + + dual_timestamp* dual_timestamp_get(dual_timestamp *ts); +-- +1.7.10.4 + +From 1022373284b7562431fb0a6dba45db8af089a0e3 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:54:19 +0100 +Subject: [PATCH] kmod-setup: add conditional module loading callback + +--- + src/core/kmod-setup.c | 32 ++++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index ce8a8e7..383a6b2 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -30,11 +30,17 @@ + + #include "kmod-setup.h" + +-static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "efivarfs", "/sys/firmware/efi/efivars", +- "unix", "/proc/net/unix" ++typedef struct Kmodule { ++ const char *name; ++ const char *directory; ++ bool (*condition_fn)(void); ++} KModule; ++ ++static const KModule kmod_table[] = { ++ { "autofs4", "/sys/class/misc/autofs", NULL } , ++ { "ipv6", "/sys/module/ipv6", NULL }, ++ { "efivarfs", "/sys/firmware/efi/efivars", NULL }, ++ { "unix", "/proc/net/unix", NULL } , + }; + + #pragma GCC diagnostic push +@@ -42,7 +48,8 @@ static const char * const kmod_table[] = { + static void systemd_kmod_log(void *data, int priority, const char *file, int line, + const char *fn, const char *format, va_list args) + { +- log_metav(priority, file, line, fn, format, args); ++ /* library logging is enabled at debug only */ ++ log_metav(LOG_DEBUG, file, line, fn, format, args); + } + #pragma GCC diagnostic pop + +@@ -53,13 +60,15 @@ int kmod_setup(void) { + int err; + + for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) { ++ if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn()) ++ continue; + +- if (access(kmod_table[i+1], F_OK) >= 0) ++ if (access(kmod_table[i].directory, F_OK) >= 0) + continue; + + log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. " + "We'll now try to work around this by loading the module...", +- kmod_table[i]); ++ kmod_table[i].name); + + if (!ctx) { + ctx = kmod_new(NULL, NULL); +@@ -69,13 +78,12 @@ int kmod_setup(void) { + } + + kmod_set_log_fn(ctx, systemd_kmod_log, NULL); +- + kmod_load_resources(ctx); + } + +- err = kmod_module_new_from_name(ctx, kmod_table[i], &mod); ++ err = kmod_module_new_from_name(ctx, kmod_table[i].name, &mod); + if (err < 0) { +- log_error("Failed to load module '%s'", kmod_table[i]); ++ log_error("Failed to lookup module '%s'", kmod_table[i].name); + continue; + } + +@@ -85,7 +93,7 @@ int kmod_setup(void) { + else if (err == KMOD_PROBE_APPLY_BLACKLIST) + log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); + else +- log_error("Failed to insert '%s'", kmod_module_get_name(mod)); ++ log_error("Failed to insert module '%s'", kmod_module_get_name(mod)); + + kmod_module_unref(mod); + } +-- +1.7.10.4 + +From 3dfb265083347cb5700dc38f7cc0f479f378e6e9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:55:23 +0100 +Subject: [PATCH] kmod-setup: mounting efivarfs, *after* we tried to mount it, + is pointless + +The mount() system call, which we issue before loading modules, will trigger +a modprobe by the kernel and block until it returns. Trying to load it again +later, will have exactly the same result as the first time. +--- + src/core/kmod-setup.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 383a6b2..20ab232 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -39,7 +39,6 @@ typedef struct Kmodule { + static const KModule kmod_table[] = { + { "autofs4", "/sys/class/misc/autofs", NULL } , + { "ipv6", "/sys/module/ipv6", NULL }, +- { "efivarfs", "/sys/firmware/efi/efivars", NULL }, + { "unix", "/proc/net/unix", NULL } , + }; + +-- +1.7.10.4 + +From 6aa220e019f9dffd96590b06b68f937985204109 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 17:03:48 +0100 +Subject: [PATCH] mount-setup: try mounting 'efivarfs' only if the system + bootet with EFI + +--- + TODO | 3 --- + src/core/mount-setup.c | 50 ++++++++++++++++++++++++++++++++---------------- + 2 files changed, 34 insertions(+), 19 deletions(-) + +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 9894c7f..98614d0 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -46,14 +46,20 @@ + #define TTY_GID 5 + #endif + ++typedef enum MountMode { ++ MNT_NONE = 0, ++ MNT_FATAL = 1 << 0, ++ MNT_IN_CONTAINER = 1 << 1, ++} MountMode; ++ + typedef struct MountPoint { + const char *what; + const char *where; + const char *type; + const char *options; + unsigned long flags; +- bool fatal; +- bool in_container; ++ bool (*condition_fn)(void); ++ MountMode mode; + } MountPoint; + + /* The first three entries we might need before SELinux is up. The +@@ -62,16 +68,26 @@ typedef struct MountPoint { + #define N_EARLY_MOUNT 4 + + static const MountPoint mount_table[] = { +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, +- { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, +- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, false, true }, +- { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, true }, ++ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_NONE }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ is_efiboot, MNT_NONE }, ++ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, ++ NULL, MNT_IN_CONTAINER }, ++ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_IN_CONTAINER }, ++ { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_IN_CONTAINER }, + }; + + /* These are API file systems that might be mounted by other software, +@@ -119,6 +135,9 @@ static int mount_one(const MountPoint *p, bool relabel) { + + assert(p); + ++ if (p->condition_fn && !p->condition_fn()) ++ return 0; ++ + /* Relabel first, just in case */ + if (relabel) + label_fix(p->where, true, true); +@@ -131,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) { + return 0; + + /* Skip securityfs in a container */ +- if (!p->in_container && detect_container(NULL) > 0) ++ if (!(p->mode & MNT_IN_CONTAINER) && detect_container(NULL) > 0) + return 0; + + /* The access mode here doesn't really matter too much, since +@@ -149,8 +168,8 @@ static int mount_one(const MountPoint *p, bool relabel) { + p->type, + p->flags, + p->options) < 0) { +- log_full(p->fatal ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); +- return p->fatal ? -errno : 0; ++ log_full((p->mode & MNT_FATAL) ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); ++ return (p->mode & MNT_FATAL) ? -errno : 0; + } + + /* Relabel again, since we now mounted something fresh here */ +@@ -289,7 +308,6 @@ int mount_cgroup_controllers(char ***join_controllers) { + p.type = "cgroup"; + p.options = options; + p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV; +- p.fatal = false; + + r = mount_one(&p, true); + free(controller); +-- +1.7.10.4 + Index: sync-on-shutdown.patch =================================================================== --- sync-on-shutdown.patch (added) +++ sync-on-shutdown.patch (revision 5) @@ -0,0 +1,49 @@ +From 0049f05a8bb82c3e084bacc5945596761d706c55 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 16 Nov 2012 01:30:29 +0100 +Subject: [PATCH] shutdown: readd explicit sync() when shutting down + +As it turns out reboot() doesn't actually imply a file system sync, but +only a disk sync. Accordingly, readd explicit sync() invocations +immediately before we invoke reboot(). + +This is much less dramatic than it might sounds as we umount all +disks/read-only remount them anyway before going down. +--- + src/core/service.c | 1 + + src/core/shutdown.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/core/service.c b/src/core/service.c +index cf08485..df72aba 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2485,6 +2485,7 @@ static int service_start_limit_test(Service *s) { + + case SERVICE_START_LIMIT_REBOOT_IMMEDIATE: + log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id); ++ sync(); + reboot(RB_AUTOBOOT); + break; + +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index cc8c57b..b59aef1 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -273,6 +273,13 @@ int main(int argc, char *argv[]) { + } + } + ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. So let's do this here, but not ++ * needlessly slow down containers. */ ++ if (!in_container) ++ sync(); ++ + if (cmd == LINUX_REBOOT_CMD_KEXEC) { + + if (!in_container) { +-- +1.7.10.4 + Index: systemd-journald.init =================================================================== --- systemd-journald.init (added) +++ systemd-journald.init (revision 5) @@ -0,0 +1,33 @@ +#! /bin/sh +# +# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# /etc/init.d/systemd-journald +# +### BEGIN INIT INFO +# Provides: syslog +# Required-Start: $null +# Required-Stop: $null +# Default-Start: 2 3 5 +# Default-Stop: +# Short-Description: compat wrapper for journald +# Description: compat wrapper for journald +### END INIT INFO + +. /etc/rc.status + +rc_reset + +case "$1" in + start|stop|restart) + rc_failed 3 + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +rc_exit Index: xdm-display-manager.patch =================================================================== --- xdm-display-manager.patch (added) +++ xdm-display-manager.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-195/units/graphical.target +=================================================================== +--- systemd-195.orig/units/graphical.target ++++ systemd-195/units/graphical.target +@@ -11,7 +11,7 @@ Documentation=man:systemd.special(7) + Requires=multi-user.target + After=multi-user.target + Conflicts=rescue.target +-Wants=display-manager.service ++Wants=xdm.service + AllowIsolate=yes + + [Install] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=312
2012-11-20 13:10:12 +01:00
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service
ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/swap.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/startpreload.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/stoppreload.service
ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/earlyxdm.service
ln -s systemd-sysctl.service %{buildroot}/%{_prefix}/lib/systemd/system/sysctl.service
build fails due to rpmlint bug, nothing to do with this change at all OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=413
2013-07-05 09:29:00 +02:00
ln -s systemd-random-seed.service %{buildroot}/%{_prefix}/lib/systemd/system/random.service
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
# don't mount /tmp as tmpfs for now
rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
(please fwd to 13.1 too) - Release v208: + logind gained support for facilitating privileged input and drm devices access for unprivileged clients (helps Wayland / kmscon). + New kernel command line luks.options= allows to specify LUKS options, when used with luks.uuid= + tmpfileS.d snippets can uses specifier expansion in path names (%m, %b, %H, %v). + New tmpfiles.d command "m" introduced to change owner/group/access mode of a file/directory only if it exists. + MemorySoftLimit= cgroup settings is no longer supported (underlying kernel cgroup attribute will disappear in the future). + memeory.use_hierarchy cgroup attribute is enabled for all cgroups systemd creates in memory cgroup hierarchy. + New filed _SYSTEMD_SLICE= is logged in journal messages related to a slice. + systemd-journald will no longer adjust the group of journal files it creates to "systemd-journal" group. Permissions and owernship is adjusted when package is upgraded. + Backlight and random seed files are now stored in /var/lib/systemd. + Boot time performance measurements included ACPI 5.0 FPDT informations if available. - Drop merged patches: 0001-cgroup-add-the-missing-setting-of-variable-s-value.patch, 0002-cgroup-correct-the-log-information.patch, 0003-cgroup-fix-incorrectly-setting-memory-cgroup.patch, 0004-random-seed-we-should-return-errno-of-failed-loop_wr.patch, 0005-core-cgroup-first-print-then-free.patch, OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=448
2013-10-02 13:01:24 +02:00
# don't enable wall ask password service, it spams every console (bnc#747783)
rm %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/systemd-ask-password-wall.path
- Rename remaning udev patches (clean-up). - Generate %{_libexecdir}/modules-load.d/sg.conf so we load sg module at boot time not from udev (bnc#761109). - Drop unused patches: 1001-Reinstate-TIMEOUT-handling.patch 1005-udev-fix-sg-autoload-regression.patch 1026-re-add-persistent-net.patch - Rename remaning udev patches (clean-up). - Generate %{_libexecdir}/modules-load.d/sg.conf so we load sg module at boot time not from udev (bnc#761109). - Drop unused patches: 1001-Reinstate-TIMEOUT-handling.patch 1005-udev-fix-sg-autoload-regression.patch 1026-re-add-persistent-net.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=371
2013-04-25 10:33:19 +02:00
# create %{_libexecdir}/modules-load.d
mkdir -p %{buildroot}%{_libexecdir}/modules-load.d
cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf
# load sg module at boot time
sg
EOF
- Ensure systemd show service status when started behind bootsplash (bnc#736225). - Disable core dump redirection to journal, not stable atm. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=237
2012-01-31 13:42:31 +01:00
# To avoid making life hard for Factory developers, don't package the
# kernel.core_pattern setting until systemd-coredump is a part of an actual
# systemd release and it's made clear how to get the core dumps out of the
# journal.
- Do no ship defaults for sysctl, they should be part of aaa_base (currently in procps). - Add hostname-setup-shortname.patch: ensure shortname is set as hostname (bnc#820213). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=385
2013-05-27 11:58:29 +02:00
rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-coredump.conf
# do not ship sysctl defaults in systemd package, will be part of
# aaa_base (in procps for now)
rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf
- Ensure systemd show service status when started behind bootsplash (bnc#736225). - Disable core dump redirection to journal, not stable atm. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=237
2012-01-31 13:42:31 +01:00
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
# remove README file for now
rm -f %{buildroot}/etc/init.d/README
%if 0%{?bootstrap}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
rm -f %{buildroot}%{_localstatedir}/log/README
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=516
2014-02-11 19:40:08 +01:00
rm -rf %{buildroot}%{_datadir}/bash-completion
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
%endif
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
# legacy links
Explicitly require pam-config for %post of the main package, fixes build Also cleaned up whitespaces in spec and changelog OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=449
2013-10-02 16:37:41 +02:00
for f in loginctl journalctl ; do
- links more manpages for migrated tools (from Christopher Yeleighton). - disable boot.localnet service, ypbind service will do the right thing now (bnc#716746) - add xdm-display-manager.patch: pull xdm.service instead of display-manager.service (needed until xdm initscript is migrated to native systemd service). - Add fix-permissions-btmp.patch: ensure btmp is owned only by root (bnc#777405). - Have the udev package create a tape group, as referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules (DimStar). - Add fix-bad-memory-access.patch: fix crash in journal rotation. - Add fix-dbus-crash.patch: fix D-Bus caused crash. - Add sync-on-shutdown.patch: ensure sync is done when initiating shutdown. - Add mount-efivars.patch: mount efivars if booting on UEFI. - Ship a empty systemd-journald initscript in systemd-logger to stop insserv to complain about missing syslog dependency. - Update 0001-service-Fix-dependencies-added-when-parsing-insserv..patch with bug fixes from Debian. old: Base:System/systemd new: home:fcrozat:branches:Base:System/systemd rev NoneIndex: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch =================================================================== --- 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 311) +++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 5) @@ -1,17 +1,35 @@ -From 6620bceb7233a830be3635a4f7a7dc75c13a9c8e Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Fri, 30 Sep 2011 14:12:45 +0200 -Subject: [PATCH] service: Fix dependencies added when parsing insserv.conf - ---- - src/service.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -Index: systemd-41/src/service.c +Index: systemd-195/src/core/service.c =================================================================== ---- systemd-41.orig/src/core/service.c -+++ systemd-41/src/core/service.c -@@ -3210,23 +3210,30 @@ static void sysv_facility_in_insserv_con +--- systemd-195.orig/src/core/service.c ++++ systemd-195/src/core/service.c +@@ -3391,12 +3391,13 @@ static void service_notify_message(Unit + + #ifdef HAVE_SYSV_COMPAT + +-#ifdef TARGET_SUSE +-static void sysv_facility_in_insserv_conf(Manager *mgr) { +- FILE *f=NULL; ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) ++static void sysv_parse_insserv_conf(Manager *mgr, const char* filename) { ++ FILE *f = NULL; + int r; + +- if (!(f = fopen("/etc/insserv.conf", "re"))) { ++ if (!(f = fopen(filename, "re"))) { ++ log_error("Failed to open file %s", filename); + r = errno == ENOENT ? 0 : -errno; + goto finish; + } +@@ -3410,7 +3411,7 @@ static void sysv_facility_in_insserv_con + break; + + r = -errno; +- log_error("Failed to read configuration file '/etc/insserv.conf': %s", strerror(-r)); ++ log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); + goto finish; + } + +@@ -3425,23 +3426,30 @@ static void sysv_facility_in_insserv_con Unit *u; if (sysv_translate_facility(parsed[0], NULL, &facility) < 0) continue; @@ -29,12 +47,12 @@ STRV_FOREACH (j, parsed+1) { - if (*j[0]=='+') { - e = UNIT_WANTS; -+ if (*j[0]=='+') ++ if (*j[0] == '+') name = *j+1; - } - else { - e = UNIT_REQUIRES; -+ else ++ else name = *j; - } + if (streq(name, "boot.localfs") || @@ -44,9 +62,54 @@ continue; - r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, e, dep, NULL, true); -+ r = unit_add_dependency_by_name_inverse(u, UNIT_BEFORE, dep, NULL, true); -+ if (*j[0]!='+') ++ r = unit_add_two_dependencies_by_name_inverse(u, UNIT_WANTS, UNIT_BEFORE, dep, NULL, true); ++ if (*j[0] != '+') + r = unit_add_dependency_by_name(u, UNIT_REQUIRES, dep, NULL, true); free(dep); } } +@@ -3454,6 +3462,35 @@ finish: + fclose(f); + + } ++ ++static void sysv_facility_in_insserv_conf(Manager *mgr) { ++ DIR *d =NULL; ++ struct dirent *de; ++ ++#ifdef TARGET_DEBIAN ++ if (!(d = opendir("/etc/insserv.conf.d/"))) ++ if (errno != ENOENT) { ++ log_warning("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); ++ goto finish; ++ } ++ ++ while ((de = readdir(d))) { ++ char *path = NULL; ++ if (ignore_file(de->d_name)) ++ continue; ++ ++ path = join("/etc/insserv.conf.d/", de->d_name, NULL); ++ sysv_parse_insserv_conf(mgr, path); ++ free(path); ++ } ++finish: ++ if (d) ++ closedir(d); ++#endif ++ ++ sysv_parse_insserv_conf(mgr, "/etc/insserv.conf"); ++} ++ + #endif + + static int service_enumerate(Manager *m) { +@@ -3604,7 +3641,7 @@ static int service_enumerate(Manager *m) + + r = 0; + +-#ifdef TARGET_SUSE ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) + sysv_facility_in_insserv_conf (m); + #endif + Index: systemd-mini.changes =================================================================== --- systemd-mini.changes (revision 311) +++ systemd-mini.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd-mini.spec =================================================================== --- systemd-mini.spec (revision 311) +++ systemd-mini.spec (revision 5) @@ -102,6 +102,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -128,6 +129,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -137,6 +140,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -151,8 +162,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -313,6 +322,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -337,6 +347,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -368,8 +384,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -378,11 +400,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -392,7 +409,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -415,8 +432,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -442,8 +458,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -532,6 +552,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -724,6 +746,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -787,7 +813,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -878,6 +908,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: systemd.changes =================================================================== --- systemd.changes (revision 311) +++ systemd.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd.spec =================================================================== --- systemd.spec (revision 311) +++ systemd.spec (revision 5) @@ -97,6 +97,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -123,6 +124,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -132,6 +135,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -146,8 +157,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -308,6 +317,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -332,6 +342,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -363,8 +379,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -373,11 +395,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -387,7 +404,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -410,8 +427,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -437,8 +453,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -527,6 +547,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -719,6 +741,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -782,7 +808,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -873,6 +903,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: fix-bad-memory-access.patch =================================================================== --- fix-bad-memory-access.patch (added) +++ fix-bad-memory-access.patch (revision 5) @@ -0,0 +1,23 @@ +From 7d73c1343be02a59b17de0cd34375deeb815d89c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 20 Nov 2012 00:19:27 +0100 +Subject: [PATCH] journald: fix bad memory access + +https://bugzilla.redhat.com/show_bug.cgi?id=875653 +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: systemd-195/src/journal/journald.c +=================================================================== +--- systemd-195.orig/src/journal/journald.c ++++ systemd-195/src/journal/journald.c +@@ -342,7 +342,7 @@ static void server_rotate(Server *s) { + HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { + r = journal_file_rotate(&f, s->compress, s->seal); + if (r < 0) +- if (f->path) ++ if (f) + log_error("Failed to rotate %s: %s", f->path, strerror(-r)); + else + log_error("Failed to create user journal: %s", strerror(-r)); Index: fix-dbus-crash.patch =================================================================== --- fix-dbus-crash.patch (added) +++ fix-dbus-crash.patch (revision 5) @@ -0,0 +1,32 @@ +From 645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Wed, 31 Oct 2012 11:53:56 +0100 +Subject: [PATCH] dbus-manager: fix a fatal dbus abort in + bus_manager_message_handler() + +If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref() +will be called twice on "reply", causing systemd to crash. So remove +the call to dbus_message_unref(); it is unnecessary because of +the cleanup attribute on "reply". + +[zj: modified to leave one dbus_message_unref() alone, per Colin +Walters' comment.] +--- + src/core/dbus-manager.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index 2010241..3cf3e90 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -1436,7 +1436,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h); + if (r < 0) { + unit_file_list_free(h); +- dbus_message_unref(reply); + return bus_send_error_reply(connection, message, NULL, r); + } + +-- +1.7.10.4 + Index: fix-permissions-btmp.patch =================================================================== --- fix-permissions-btmp.patch (added) +++ fix-permissions-btmp.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-44/tmpfiles.d/systemd.conf +=================================================================== +--- systemd-44.orig/tmpfiles.d/systemd.conf ++++ systemd-44/tmpfiles.d/systemd.conf +@@ -11,7 +11,7 @@ d /run/user 0755 root root 10d + F /run/utmp 0664 root utmp - + + f /var/log/wtmp 0664 root utmp - +-f /var/log/btmp 0600 root utmp - ++f /var/log/btmp 0600 root root - + + d /var/cache/man - - - 30d + Index: mount-efivars.patch =================================================================== --- mount-efivars.patch (added) +++ mount-efivars.patch (revision 5) @@ -0,0 +1,336 @@ +From f271dd97622b656c1c013d181ea615c671cc2438 Mon Sep 17 00:00:00 2001 +From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> +Date: Sat, 27 Oct 2012 11:23:22 +0800 +Subject: [PATCH] systemd: mount the EFI variable filesystem +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add efivarfs to the mount_table in mount-setup.c, so the EFI variable +filesystem will be mounted when systemd executed. + +The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel. + +Cc: Kay Sievers <kay@vrfy.org> +Cc: Lennart Poettering <lennart@poettering.net> +Cc: Mantas Mikulėnas <grawity@gmail.com> +Cc: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> +Cc: Matt Fleming <matt.fleming@intel.com> +Cc: Jeremy Kerr <jeremy.kerr@canonical.com> +Cc: Matthew Garrett <mjg@redhat.com> +Signed-off-by: Lee, Chun-Yi <jlee@suse.com> +--- + src/core/kmod-setup.c | 7 ++++--- + src/core/mount-setup.c | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index cc2a2d9..ce8a8e7 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -31,9 +31,10 @@ + #include "kmod-setup.h" + + static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "unix", "/proc/net/unix" ++ "autofs4", "/sys/class/misc/autofs", ++ "ipv6", "/sys/module/ipv6", ++ "efivarfs", "/sys/firmware/efi/efivars", ++ "unix", "/proc/net/unix" + }; + + #pragma GCC diagnostic push +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 0fd112f..9894c7f 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, + { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, + { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +-- +1.7.10.4 + +From c1e5704657315b436c0409e8172c1fcb76adccad Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:06:27 +0100 +Subject: [PATCH] shared: add is_efiboot() + +--- + src/shared/util.c | 4 ++++ + src/shared/util.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 2a8afae..9983695 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -77,6 +77,10 @@ char **saved_argv = NULL; + static volatile unsigned cached_columns = 0; + static volatile unsigned cached_lines = 0; + ++bool is_efiboot(void) { ++ return access("/sys/firmware/efi", F_OK) >= 0; ++} ++ + size_t page_size(void) { + static __thread size_t pgsz = 0; + long r; +diff --git a/src/shared/util.h b/src/shared/util.h +index e387b12..99972cc 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -90,6 +90,8 @@ union dirent_storage { + #define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m" + #define ANSI_HIGHLIGHT_OFF "\x1B[0m" + ++bool is_efiboot(void); ++ + usec_t now(clockid_t clock); + + dual_timestamp* dual_timestamp_get(dual_timestamp *ts); +-- +1.7.10.4 + +From 1022373284b7562431fb0a6dba45db8af089a0e3 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:54:19 +0100 +Subject: [PATCH] kmod-setup: add conditional module loading callback + +--- + src/core/kmod-setup.c | 32 ++++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index ce8a8e7..383a6b2 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -30,11 +30,17 @@ + + #include "kmod-setup.h" + +-static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "efivarfs", "/sys/firmware/efi/efivars", +- "unix", "/proc/net/unix" ++typedef struct Kmodule { ++ const char *name; ++ const char *directory; ++ bool (*condition_fn)(void); ++} KModule; ++ ++static const KModule kmod_table[] = { ++ { "autofs4", "/sys/class/misc/autofs", NULL } , ++ { "ipv6", "/sys/module/ipv6", NULL }, ++ { "efivarfs", "/sys/firmware/efi/efivars", NULL }, ++ { "unix", "/proc/net/unix", NULL } , + }; + + #pragma GCC diagnostic push +@@ -42,7 +48,8 @@ static const char * const kmod_table[] = { + static void systemd_kmod_log(void *data, int priority, const char *file, int line, + const char *fn, const char *format, va_list args) + { +- log_metav(priority, file, line, fn, format, args); ++ /* library logging is enabled at debug only */ ++ log_metav(LOG_DEBUG, file, line, fn, format, args); + } + #pragma GCC diagnostic pop + +@@ -53,13 +60,15 @@ int kmod_setup(void) { + int err; + + for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) { ++ if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn()) ++ continue; + +- if (access(kmod_table[i+1], F_OK) >= 0) ++ if (access(kmod_table[i].directory, F_OK) >= 0) + continue; + + log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. " + "We'll now try to work around this by loading the module...", +- kmod_table[i]); ++ kmod_table[i].name); + + if (!ctx) { + ctx = kmod_new(NULL, NULL); +@@ -69,13 +78,12 @@ int kmod_setup(void) { + } + + kmod_set_log_fn(ctx, systemd_kmod_log, NULL); +- + kmod_load_resources(ctx); + } + +- err = kmod_module_new_from_name(ctx, kmod_table[i], &mod); ++ err = kmod_module_new_from_name(ctx, kmod_table[i].name, &mod); + if (err < 0) { +- log_error("Failed to load module '%s'", kmod_table[i]); ++ log_error("Failed to lookup module '%s'", kmod_table[i].name); + continue; + } + +@@ -85,7 +93,7 @@ int kmod_setup(void) { + else if (err == KMOD_PROBE_APPLY_BLACKLIST) + log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); + else +- log_error("Failed to insert '%s'", kmod_module_get_name(mod)); ++ log_error("Failed to insert module '%s'", kmod_module_get_name(mod)); + + kmod_module_unref(mod); + } +-- +1.7.10.4 + +From 3dfb265083347cb5700dc38f7cc0f479f378e6e9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:55:23 +0100 +Subject: [PATCH] kmod-setup: mounting efivarfs, *after* we tried to mount it, + is pointless + +The mount() system call, which we issue before loading modules, will trigger +a modprobe by the kernel and block until it returns. Trying to load it again +later, will have exactly the same result as the first time. +--- + src/core/kmod-setup.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 383a6b2..20ab232 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -39,7 +39,6 @@ typedef struct Kmodule { + static const KModule kmod_table[] = { + { "autofs4", "/sys/class/misc/autofs", NULL } , + { "ipv6", "/sys/module/ipv6", NULL }, +- { "efivarfs", "/sys/firmware/efi/efivars", NULL }, + { "unix", "/proc/net/unix", NULL } , + }; + +-- +1.7.10.4 + +From 6aa220e019f9dffd96590b06b68f937985204109 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 17:03:48 +0100 +Subject: [PATCH] mount-setup: try mounting 'efivarfs' only if the system + bootet with EFI + +--- + TODO | 3 --- + src/core/mount-setup.c | 50 ++++++++++++++++++++++++++++++++---------------- + 2 files changed, 34 insertions(+), 19 deletions(-) + +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 9894c7f..98614d0 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -46,14 +46,20 @@ + #define TTY_GID 5 + #endif + ++typedef enum MountMode { ++ MNT_NONE = 0, ++ MNT_FATAL = 1 << 0, ++ MNT_IN_CONTAINER = 1 << 1, ++} MountMode; ++ + typedef struct MountPoint { + const char *what; + const char *where; + const char *type; + const char *options; + unsigned long flags; +- bool fatal; +- bool in_container; ++ bool (*condition_fn)(void); ++ MountMode mode; + } MountPoint; + + /* The first three entries we might need before SELinux is up. The +@@ -62,16 +68,26 @@ typedef struct MountPoint { + #define N_EARLY_MOUNT 4 + + static const MountPoint mount_table[] = { +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, +- { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, +- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, false, true }, +- { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, true }, ++ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_NONE }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ is_efiboot, MNT_NONE }, ++ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, ++ NULL, MNT_IN_CONTAINER }, ++ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_IN_CONTAINER }, ++ { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_IN_CONTAINER }, + }; + + /* These are API file systems that might be mounted by other software, +@@ -119,6 +135,9 @@ static int mount_one(const MountPoint *p, bool relabel) { + + assert(p); + ++ if (p->condition_fn && !p->condition_fn()) ++ return 0; ++ + /* Relabel first, just in case */ + if (relabel) + label_fix(p->where, true, true); +@@ -131,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) { + return 0; + + /* Skip securityfs in a container */ +- if (!p->in_container && detect_container(NULL) > 0) ++ if (!(p->mode & MNT_IN_CONTAINER) && detect_container(NULL) > 0) + return 0; + + /* The access mode here doesn't really matter too much, since +@@ -149,8 +168,8 @@ static int mount_one(const MountPoint *p, bool relabel) { + p->type, + p->flags, + p->options) < 0) { +- log_full(p->fatal ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); +- return p->fatal ? -errno : 0; ++ log_full((p->mode & MNT_FATAL) ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); ++ return (p->mode & MNT_FATAL) ? -errno : 0; + } + + /* Relabel again, since we now mounted something fresh here */ +@@ -289,7 +308,6 @@ int mount_cgroup_controllers(char ***join_controllers) { + p.type = "cgroup"; + p.options = options; + p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV; +- p.fatal = false; + + r = mount_one(&p, true); + free(controller); +-- +1.7.10.4 + Index: sync-on-shutdown.patch =================================================================== --- sync-on-shutdown.patch (added) +++ sync-on-shutdown.patch (revision 5) @@ -0,0 +1,49 @@ +From 0049f05a8bb82c3e084bacc5945596761d706c55 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 16 Nov 2012 01:30:29 +0100 +Subject: [PATCH] shutdown: readd explicit sync() when shutting down + +As it turns out reboot() doesn't actually imply a file system sync, but +only a disk sync. Accordingly, readd explicit sync() invocations +immediately before we invoke reboot(). + +This is much less dramatic than it might sounds as we umount all +disks/read-only remount them anyway before going down. +--- + src/core/service.c | 1 + + src/core/shutdown.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/core/service.c b/src/core/service.c +index cf08485..df72aba 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2485,6 +2485,7 @@ static int service_start_limit_test(Service *s) { + + case SERVICE_START_LIMIT_REBOOT_IMMEDIATE: + log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id); ++ sync(); + reboot(RB_AUTOBOOT); + break; + +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index cc8c57b..b59aef1 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -273,6 +273,13 @@ int main(int argc, char *argv[]) { + } + } + ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. So let's do this here, but not ++ * needlessly slow down containers. */ ++ if (!in_container) ++ sync(); ++ + if (cmd == LINUX_REBOOT_CMD_KEXEC) { + + if (!in_container) { +-- +1.7.10.4 + Index: systemd-journald.init =================================================================== --- systemd-journald.init (added) +++ systemd-journald.init (revision 5) @@ -0,0 +1,33 @@ +#! /bin/sh +# +# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# /etc/init.d/systemd-journald +# +### BEGIN INIT INFO +# Provides: syslog +# Required-Start: $null +# Required-Stop: $null +# Default-Start: 2 3 5 +# Default-Stop: +# Short-Description: compat wrapper for journald +# Description: compat wrapper for journald +### END INIT INFO + +. /etc/rc.status + +rc_reset + +case "$1" in + start|stop|restart) + rc_failed 3 + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +rc_exit Index: xdm-display-manager.patch =================================================================== --- xdm-display-manager.patch (added) +++ xdm-display-manager.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-195/units/graphical.target +=================================================================== +--- systemd-195.orig/units/graphical.target ++++ systemd-195/units/graphical.target +@@ -11,7 +11,7 @@ Documentation=man:systemd.special(7) + Requires=multi-user.target + After=multi-user.target + Conflicts=rescue.target +-Wants=display-manager.service ++Wants=xdm.service + AllowIsolate=yes + + [Install] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=312
2012-11-20 13:10:12 +01:00
ln -s $f %{buildroot}%{_bindir}/systemd-$f
%if ! 0%{?bootstrap}
ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
%endif
done
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
ln -s /usr/lib/udev %{buildroot}/lib/udev
- Update to version 40: + reason why a service failed is now exposed in the"Result" D-Bus property. + Rudimentary service watchdog support (not complete) + Improve bootcharts, by immediatly changing argv[0] after forking to to reflect which process will be executed. + Various bug fixes. - Add remote-fs-after-network.patch and update insserv patch: ensure remote-fs-pre.target is enabled and started before network mount points (bnc#744293). - Ensure journald doesn't prevent syslogs to read from /proc/kmsg. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=240
2012-02-07 16:49:03 +01:00
Update for systemd to include a persistent journal. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=233
2012-01-19 15:25:36 +01:00
# Create the /var/log/journal directory to change the volatile journal to a persistent one
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
mkdir -p %{buildroot}%{_localstatedir}/log/journal/
Update for systemd to include a persistent journal. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=233
2012-01-19 15:25:36 +01:00
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
# Make sure directories in /var exist
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
#create ghost databases
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
touch %{buildroot}%{_sysconfdir}/udev/hwdb.bin
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
# Make sure the NTP units dir exists
mkdir -p %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/
# Make sure the shutdown/sleep drop-in dirs exist
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/
# Make sure these directories are properly owned
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants
- Use drop-in file to fix bnc#804158. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=370
2013-04-25 09:23:12 +02:00
# create drop-in to prevent tty1 to be cleared (bnc#804158)
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/
- Fix drop-in for getty@tty1.service please forward to factory only once sr184712 has been accepted OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=418
2013-07-29 18:25:21 +02:00
cat << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
- Use drop-in file to fix bnc#804158. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=370
2013-04-25 09:23:12 +02:00
[Service]
# ensure tty1 isn't cleared (bnc#804158)
TTYVTDisallocate=no
EOF
- Create getty@tty1.service to restore traditional SUSE behavior of not clearing tty1. (bnc#804158) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=350
2013-02-18 17:15:49 +01:00
- Add set-ignoreonisolate-noauto-cryptsetup.patch: ensure noauto encrypted mounts survives runlevel changes (bnc#843085). - Add 0001-Fix-buffer-overrun-when-enumerating-files.patch: fix logind crash when /run/systemd/sessions was too big (bnc#840055, initial fix from hpj@suse.com). - Update sysctl-handle-boot-sysctl.conf-kernel_release.patch to only check for /boot/sysctl.conf-<uname -r> presence. - Add service wrapper for after.local (bnc#778715). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=447
2013-10-01 09:23:27 +02:00
# ensure after.local wrapper is called
install -m 644 %{S:11} %{buildroot}/%{_prefix}/lib/systemd/system/
ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=495
2014-01-23 14:25:13 +01:00
%if ! 0%{?bootstrap}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%if %{without python}
for man in systemd.directives.7 systemd.index.7
do
install -m 0644 man/$man %{buildroot}%{_mandir}/man7/
done
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=495
2014-01-23 14:25:13 +01:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=482
2014-01-14 19:31:08 +01:00
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/backlight
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/random-seed
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%fdupes -s %{buildroot}%{_mandir}
- Update to version 39: + New systemd-cgtop tool to show control groups by their resource usage. + Linking against libacl for ACLs is optional again. + If a group "adm" exists, journal files are automatically owned by them, thus allow members of this group full access to the system journal as well as all user journals. + The journal now stores the SELinux context of the logging client for all entries. + Add C++ inclusion guards to all public headers. + New output mode "cat" in the journal to print only text messages, without any meta data like date or time. + Include tiny X server wrapper as a temporary stop-gap to teach XOrg udev display enumeration (until XOrg supports udev hotplugging for display devices). + Add new systemd-cat tool for executing arbitrary programs with STDERR/STDOUT connected to the journal. Can also act as BSD logger replacement, and does so by default. + Optionally store all locally generated coredumps in the journal along with meta data. + systemd-tmpfiles learnt four new commands: n, L, c, b, for writing short strings to files (for usage for /sys), and for creating symlinks, character and block device nodes. + New unit file option ControlGroupPersistent= to make cgroups persistent. + Support multiple local RTCs in a sane way. + No longer monopolize IO when replaying readahead data on rotating disks. + Don't show kernel threads in systemd-cgls anymore, unless requested with new -k switch. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=234
2012-01-25 15:08:16 +01:00
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=531
2014-03-03 15:58:29 +01:00
%if ! 0%{?bootstrap}
for f in %{buildroot}%{_datadir}/bash-completion/completions/*
do
test -e "$f" || break
grep -q _init_completion "$f" || continue
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=541
2014-03-11 08:49:28 +01:00
echo "%exclude %{_datadir}/bash-completion/completions/${f##*/}"
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=531
2014-03-03 15:58:29 +01:00
done > files.completion
%else
> files.completion
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=508
2014-02-07 14:20:42 +01:00
%if 0%{suse_version} >= 1310
- Update to release 205: + two new unit types have been introduced: - Scope units are very similar to service units, however, are created out of pre-existing processes -- instead of PID 1 forking off the processes. - Slice units may be used to partition system resources in an hierarchial fashion and then assign other units to them. By default there are now three slices: system.slice (for all system services), user.slice (for all user sessions), machine.slice (for VMs and containers). + new concept of "transient" units, which are created at runtime using an API and not based on configuration from disk. + logind has been updated to make use of scope and slice units to manage user sessions. Logind will no longer create cgroups hierchies itself but will relying on PID 1. + A new mini-daemon "systemd-machined" has been added which may be used by virtualization managers to register local VMs/containers. machinectl tool has been added to query meta-data from systemd-machined. + Low-level cgroup configuration options ControlGroup=, ControlGroupModify=, ControlGroupPersistent=, ControlGroupAttribute= have been removed. High-level attribute settings or slice units should be used instead? + A new bus call SetUnitProperties() has been added to alter various runtime parameters of a unit, including cgroup parameters. systemctl gained set-properties command to wrap this call. + A new tool "systemd-run" has been added which can be used to run arbitrary command lines as transient services or scopes, while configuring a number of settings via the command OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=412
2013-07-04 17:28:49 +02:00
# packaged in systemd-rpm-macros
rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=508
2014-02-07 14:20:42 +01:00
%endif
- Update to release 205: + two new unit types have been introduced: - Scope units are very similar to service units, however, are created out of pre-existing processes -- instead of PID 1 forking off the processes. - Slice units may be used to partition system resources in an hierarchial fashion and then assign other units to them. By default there are now three slices: system.slice (for all system services), user.slice (for all user sessions), machine.slice (for VMs and containers). + new concept of "transient" units, which are created at runtime using an API and not based on configuration from disk. + logind has been updated to make use of scope and slice units to manage user sessions. Logind will no longer create cgroups hierchies itself but will relying on PID 1. + A new mini-daemon "systemd-machined" has been added which may be used by virtualization managers to register local VMs/containers. machinectl tool has been added to query meta-data from systemd-machined. + Low-level cgroup configuration options ControlGroup=, ControlGroupModify=, ControlGroupPersistent=, ControlGroupAttribute= have been removed. High-level attribute settings or slice units should be used instead? + A new bus call SetUnitProperties() has been added to alter various runtime parameters of a unit, including cgroup parameters. systemctl gained set-properties command to wrap this call. + A new tool "systemd-run" has been added which can be used to run arbitrary command lines as transient services or scopes, while configuring a number of settings via the command OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=412
2013-07-04 17:28:49 +02:00
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
%if %{without compat_libs}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=539
2014-03-07 14:07:54 +01:00
lib=%{_libdir}/libsystemd.so
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=537
2014-03-07 10:33:04 +01:00
for lnk in daemon login id128 journal
do
lnk=%{buildroot}%{_libdir}/libsystemd-${lnk}.so
echo '/* GNU ld script */' > ${lnk}
echo 'INPUT('${lib}')' >> ${lnk}
done
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
%if 0%{suse_version} <= 1310
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=640
2014-05-21 16:13:32 +02:00
cat > %{buildroot}/%{_prefix}/lib/systemd/system/fix.service <<-'EOF'
[Unit]
Description=Fix against deadlock at shutdown
Wants=remote-fs.target remote-fs-pre.target
Before=remote-fs.target systemd-logind.service
After=remote-fs-pre.target network.target rpcbind.target nss-lookup.target nss-user-lookup.target
ConditionPathExists=|/etc/init.d/autofs
ConditionPathExists=|/etc/init.d/nfs
[Service]
Type=oneshot
RemainAfterExit=true
ExecStart=/bin/true
ExecStop=-/etc/init.d/autofs stop
ExecStop=-/etc/init.d/nfs stop
[Install]
WantedBy=remote-fs.target
EOF
mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system/remote-fs.target.wants
ln -sf ../fix.service %{buildroot}/%{_prefix}/lib/systemd/system/remote-fs.target.wants
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=672
2014-06-12 12:21:33 +02:00
# Some files which may created by us or by the admin later on
mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
for ghost in X11/xorg.conf.d/00-keyboard.conf vconsole.conf locale.conf \
More work e.g. for bnc #881125 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=681
2014-06-24 13:34:12 +02:00
machine-id machine-info \
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=672
2014-06-12 12:21:33 +02:00
systemd/system/runlevel2.target \
systemd/system/runlevel3.target \
systemd/system/runlevel4.target \
systemd/system/runlevel4.target \
systemd/system/runlevel5.target
do
> %{buildroot}%{_sysconfdir}/$ghost
done
# Workaround for bug #882393
for runlevel in poweroff rescue multi-user graphical reboot
do
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/${runlevel}.target.wants
ln -sf ../systemd-update-utmp-runlevel.service %{buildroot}%{_prefix}/lib/systemd/system/${runlevel}.target.wants/
done
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=656
2014-06-03 18:28:48 +02:00
%find_lang systemd
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
%pre
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
getent group systemd-journal >/dev/null || groupadd -r systemd-journal || :
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
exit 0
checked in (request 47338) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=59
2010-09-10 16:07:55 +02:00
%post
(please fwd to 13.1 too) - Release v208: + logind gained support for facilitating privileged input and drm devices access for unprivileged clients (helps Wayland / kmscon). + New kernel command line luks.options= allows to specify LUKS options, when used with luks.uuid= + tmpfileS.d snippets can uses specifier expansion in path names (%m, %b, %H, %v). + New tmpfiles.d command "m" introduced to change owner/group/access mode of a file/directory only if it exists. + MemorySoftLimit= cgroup settings is no longer supported (underlying kernel cgroup attribute will disappear in the future). + memeory.use_hierarchy cgroup attribute is enabled for all cgroups systemd creates in memory cgroup hierarchy. + New filed _SYSTEMD_SLICE= is logged in journal messages related to a slice. + systemd-journald will no longer adjust the group of journal files it creates to "systemd-journal" group. Permissions and owernship is adjusted when package is upgraded. + Backlight and random seed files are now stored in /var/lib/systemd. + Boot time performance measurements included ACPI 5.0 FPDT informations if available. - Drop merged patches: 0001-cgroup-add-the-missing-setting-of-variable-s-value.patch, 0002-cgroup-correct-the-log-information.patch, 0003-cgroup-fix-incorrectly-setting-memory-cgroup.patch, 0004-random-seed-we-should-return-errno-of-failed-loop_wr.patch, 0005-core-cgroup-first-print-then-free.patch, OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=448
2013-10-02 13:01:24 +02:00
%if ! 0%{?bootstrap}
- Remove output and error redirection to /dev/null in install script, it might help tracing pam related issue (bnc#841573). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=442
2013-09-23 13:12:09 +02:00
/usr/sbin/pam-config -a --systemd || :
(please fwd to 13.1 too) - Release v208: + logind gained support for facilitating privileged input and drm devices access for unprivileged clients (helps Wayland / kmscon). + New kernel command line luks.options= allows to specify LUKS options, when used with luks.uuid= + tmpfileS.d snippets can uses specifier expansion in path names (%m, %b, %H, %v). + New tmpfiles.d command "m" introduced to change owner/group/access mode of a file/directory only if it exists. + MemorySoftLimit= cgroup settings is no longer supported (underlying kernel cgroup attribute will disappear in the future). + memeory.use_hierarchy cgroup attribute is enabled for all cgroups systemd creates in memory cgroup hierarchy. + New filed _SYSTEMD_SLICE= is logged in journal messages related to a slice. + systemd-journald will no longer adjust the group of journal files it creates to "systemd-journal" group. Permissions and owernship is adjusted when package is upgraded. + Backlight and random seed files are now stored in /var/lib/systemd. + Boot time performance measurements included ACPI 5.0 FPDT informations if available. - Drop merged patches: 0001-cgroup-add-the-missing-setting-of-variable-s-value.patch, 0002-cgroup-correct-the-log-information.patch, 0003-cgroup-fix-incorrectly-setting-memory-cgroup.patch, 0004-random-seed-we-should-return-errno-of-failed-loop_wr.patch, 0005-core-cgroup-first-print-then-free.patch, OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=448
2013-10-02 13:01:24 +02:00
%endif
- Add tty1.patch: ensure passphrase are handled before starting gettty on tty1. - Add inittab generator, creating default.target at startup based on /etc/inittab value. - No longer try to create /etc/systemd/system/default.target at initial package install (bnc#707418) - Fix configuration path used for systemd user manager. - Ensure pam-config output is no display in install script. - Remove buildrequires on vala, no longer needed. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=183
2011-08-24 17:35:41 +02:00
/sbin/ldconfig
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
[ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ > /dev/null || :
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
/usr/bin/systemd-machine-id-setup >/dev/null 2>&1 || :
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
/usr/lib/systemd/systemd-random-seed save >/dev/null 2>&1 || :
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
/usr/bin/systemctl daemon-reexec >/dev/null 2>&1 || :
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
/usr/bin/journalctl --update-catalog >/dev/null 2>&1 || :
(please fwd to 13.1 too) - Release v208: + logind gained support for facilitating privileged input and drm devices access for unprivileged clients (helps Wayland / kmscon). + New kernel command line luks.options= allows to specify LUKS options, when used with luks.uuid= + tmpfileS.d snippets can uses specifier expansion in path names (%m, %b, %H, %v). + New tmpfiles.d command "m" introduced to change owner/group/access mode of a file/directory only if it exists. + MemorySoftLimit= cgroup settings is no longer supported (underlying kernel cgroup attribute will disappear in the future). + memeory.use_hierarchy cgroup attribute is enabled for all cgroups systemd creates in memory cgroup hierarchy. + New filed _SYSTEMD_SLICE= is logged in journal messages related to a slice. + systemd-journald will no longer adjust the group of journal files it creates to "systemd-journal" group. Permissions and owernship is adjusted when package is upgraded. + Backlight and random seed files are now stored in /var/lib/systemd. + Boot time performance measurements included ACPI 5.0 FPDT informations if available. - Drop merged patches: 0001-cgroup-add-the-missing-setting-of-variable-s-value.patch, 0002-cgroup-correct-the-log-information.patch, 0003-cgroup-fix-incorrectly-setting-memory-cgroup.patch, 0004-random-seed-we-should-return-errno-of-failed-loop_wr.patch, 0005-core-cgroup-first-print-then-free.patch, OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=448
2013-10-02 13:01:24 +02:00
# Make sure new journal files
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
chgrp systemd-journal %{_localstatedir}/log/journal/ > /dev/null 2>&1 || :
chmod g+s %{_localstatedir}/log/journal/ > /dev/null 2>&1 || :
if read ID < /etc/machine-id > /dev/null 2>&1 ; then
chgrp systemd-journal %{_localstatedir}/log/journal/$ID > /dev/null 2>&1 || :
chmod g+s %{_localstatedir}/log/journal/$ID > /dev/null 2>&1 || :
fi
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=751
2014-08-18 16:41:57 +02:00
%if %{with systemgrps}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
getent group wheel && setfacl -Rnm g:wheel:rx,d:g:wheel:rx %{_localstatedir}/log/journal/ > /dev/null 2>&1 || :
getent group adm && setfacl -Rnm g:adm:rx,d:g:adm:rx %{_localstatedir}/log/journal/ > /dev/null 2>&1 || :
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=751
2014-08-18 16:41:57 +02:00
%endif
Updating link to change in openSUSE:Factory/systemd revision 5 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=a37db9acbd1b78fc3c3a865fdf1c77bb
2010-09-10 16:07:56 +02:00
- Add revert_insserv_conf_parsing.patch and systemd-insserv_conf: remove insserv.conf parsing from systemd and use generator instead. - put back default.target creation at package install and remove inittab generator, Yast2 is now able to create it. - Add revert_insserv_conf_parsing.patch and systemd-insserv_conf: remove insserv.conf parsing from systemd and use generator instead. - put back default.target creation at package install and remove inittab generator, Yast2 is now able to create it. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=189
2011-09-09 18:22:08 +02:00
# Try to read default runlevel from the old inittab if it exists
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then
- Add revert_insserv_conf_parsing.patch and systemd-insserv_conf: remove insserv.conf parsing from systemd and use generator instead. - put back default.target creation at package install and remove inittab generator, Yast2 is now able to create it. - Add revert_insserv_conf_parsing.patch and systemd-insserv_conf: remove insserv.conf parsing from systemd and use generator instead. - put back default.target creation at package install and remove inittab generator, Yast2 is now able to create it. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=189
2011-09-09 18:22:08 +02:00
runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null)
if [ -n "$runlevel" ] ; then
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
/bin/ln -sf /usr/lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target 2>&1 || :
- Add revert_insserv_conf_parsing.patch and systemd-insserv_conf: remove insserv.conf parsing from systemd and use generator instead. - put back default.target creation at package install and remove inittab generator, Yast2 is now able to create it. - Add revert_insserv_conf_parsing.patch and systemd-insserv_conf: remove insserv.conf parsing from systemd and use generator instead. - put back default.target creation at package install and remove inittab generator, Yast2 is now able to create it. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=189
2011-09-09 18:22:08 +02:00
fi
fi
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
# Create default config in /etc at first install.
# Later package updates should not overwrite these settings.
if [ "$1" -eq 1 ]; then
Updating link to change in openSUSE:Factory/systemd revision 5 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=a37db9acbd1b78fc3c3a865fdf1c77bb
2010-09-10 16:07:56 +02:00
# Enable these services by default.
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
/usr/bin/systemctl enable \
- explicitly enable getty@tty1.service intead of getty@.service as the tty1 alias has been removed from the file (bnc#833494) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=421
2013-08-06 11:25:50 +02:00
getty@tty1.service \
update OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=86
2010-11-15 20:40:23 +01:00
systemd-readahead-collect.service \
systemd-readahead-replay.service \
Updating link to change in openSUSE:Factory/systemd revision 6 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=9be1d29ab21fddfc9a76a51ef58ec696
2010-09-27 00:49:25 +02:00
remote-fs.target >/dev/null 2>&1 || :
- Add fix-devname-prefix.patch: fix modules.devname path, it isn't in /usr. - Move post script to fix symlinks in /etc/systemd/system to a trigger to run it after old systemd is uninstalled. - Add fix-debugshell.patch: use /bin/bash if sushell isn't installed (bnc#789052). - Add handle-root-uses-lang.patch: handle ROOT_USES_LANG=ctype (bnc#792182). - Ensure libudev1 and libudev-mini1 conflicts. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=317
2012-12-05 19:07:07 +01:00
fi
- Don't use a trigger to create symlink for sysctl.conf, always run the test on %post (bnc#840864). - Update sysctl-handle-boot-sysctl.conf-kernel_release.patch to ensure /boot is mounted before reading /boot/sysctl.conf-* (bnc#809420). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=438
2013-09-19 01:39:18 +02:00
# since v207 /etc/sysctl.conf is no longer parsed, however
# backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf
if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then
/bin/ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || :
fi
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
# migrate any symlink which may refer to the old path
for f in $(find /etc/systemd/system -type l -xtype l); do
new_target="/usr$(readlink $f)"
[ -f "$new_target" ] && ln -s -f $new_target $f || :
done
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
%postun
/sbin/ldconfig
- enable pam_systemd module, using pam-config. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=179
2011-08-19 10:39:33 +02:00
if [ $1 -ge 1 ]; then
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
/usr/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
fi
(please fwd to 13.1 too) - Release v208: + logind gained support for facilitating privileged input and drm devices access for unprivileged clients (helps Wayland / kmscon). + New kernel command line luks.options= allows to specify LUKS options, when used with luks.uuid= + tmpfileS.d snippets can uses specifier expansion in path names (%m, %b, %H, %v). + New tmpfiles.d command "m" introduced to change owner/group/access mode of a file/directory only if it exists. + MemorySoftLimit= cgroup settings is no longer supported (underlying kernel cgroup attribute will disappear in the future). + memeory.use_hierarchy cgroup attribute is enabled for all cgroups systemd creates in memory cgroup hierarchy. + New filed _SYSTEMD_SLICE= is logged in journal messages related to a slice. + systemd-journald will no longer adjust the group of journal files it creates to "systemd-journal" group. Permissions and owernship is adjusted when package is upgraded. + Backlight and random seed files are now stored in /var/lib/systemd. + Boot time performance measurements included ACPI 5.0 FPDT informations if available. - Drop merged patches: 0001-cgroup-add-the-missing-setting-of-variable-s-value.patch, 0002-cgroup-correct-the-log-information.patch, 0003-cgroup-fix-incorrectly-setting-memory-cgroup.patch, 0004-random-seed-we-should-return-errno-of-failed-loop_wr.patch, 0005-core-cgroup-first-print-then-free.patch, OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=448
2013-10-02 13:01:24 +02:00
%if ! 0%{?bootstrap}
- enable pam_systemd module, using pam-config. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=179
2011-08-19 10:39:33 +02:00
if [ $1 -eq 0 ]; then
- Remove output and error redirection to /dev/null in install script, it might help tracing pam related issue (bnc#841573). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=442
2013-09-23 13:12:09 +02:00
/usr/sbin/pam-config -d --systemd || :
- enable pam_systemd module, using pam-config. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=179
2011-08-19 10:39:33 +02:00
fi
(please fwd to 13.1 too) - Release v208: + logind gained support for facilitating privileged input and drm devices access for unprivileged clients (helps Wayland / kmscon). + New kernel command line luks.options= allows to specify LUKS options, when used with luks.uuid= + tmpfileS.d snippets can uses specifier expansion in path names (%m, %b, %H, %v). + New tmpfiles.d command "m" introduced to change owner/group/access mode of a file/directory only if it exists. + MemorySoftLimit= cgroup settings is no longer supported (underlying kernel cgroup attribute will disappear in the future). + memeory.use_hierarchy cgroup attribute is enabled for all cgroups systemd creates in memory cgroup hierarchy. + New filed _SYSTEMD_SLICE= is logged in journal messages related to a slice. + systemd-journald will no longer adjust the group of journal files it creates to "systemd-journal" group. Permissions and owernship is adjusted when package is upgraded. + Backlight and random seed files are now stored in /var/lib/systemd. + Boot time performance measurements included ACPI 5.0 FPDT informations if available. - Drop merged patches: 0001-cgroup-add-the-missing-setting-of-variable-s-value.patch, 0002-cgroup-correct-the-log-information.patch, 0003-cgroup-fix-incorrectly-setting-memory-cgroup.patch, 0004-random-seed-we-should-return-errno-of-failed-loop_wr.patch, 0005-core-cgroup-first-print-then-free.patch, OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=448
2013-10-02 13:01:24 +02:00
%endif
Update to v31 - to not push into factory yet OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=163
2011-07-28 12:59:10 +02:00
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%preun
if [ $1 -eq 0 ]; then
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
/usr/bin/systemctl disable \
Updating link to change in openSUSE:Factory/systemd revision 5 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=a37db9acbd1b78fc3c3a865fdf1c77bb
2010-09-10 16:07:56 +02:00
getty@.service \
update OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=86
2010-11-15 20:40:23 +01:00
systemd-readahead-collect.service \
systemd-readahead-replay.service \
Updating link to change in openSUSE:Factory/systemd revision 6 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=9be1d29ab21fddfc9a76a51ef58ec696
2010-09-27 00:49:25 +02:00
remote-fs.target >/dev/null 2>&1 || :
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
rm -f /etc/systemd/system/default.target 2>&1 || :
fi
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%pretrans -n %{udevpkgname} -p <lua>
if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
posix.symlink("/lib/udev", "/usr/lib/udev")
end
%pre -n %{udevpkgname}
if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then
rm /usr/lib/udev
mv /lib/udev /usr/lib
ln -s /usr/lib/udev /lib/udev
- /var/log/journal is now only provided by systemd-logger (journal won't be persistent for people using another syslog implementation). - install README in /var/log (in systemd-logger) and /etc/init.d - create adm group when installing systemd. - fix path in udev-root-symlink.systemd. - Enforce Requires(post) dependency on libudev in main systemd package (help upgrade). - Ensure configuration is reloaded when upgrading and save random seed when installing. - Create /lib/udev symlink, if we do a fresh install. - Add fix-build-glibc217.patch: fix build with latest glibc. - Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only used to bootstrap systemd-mini. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=311
2012-11-14 21:14:47 +01:00
elif [ ! -e /lib/udev ]; then
ln -s /usr/lib/udev /lib/udev
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
fi
- links more manpages for migrated tools (from Christopher Yeleighton). - disable boot.localnet service, ypbind service will do the right thing now (bnc#716746) - add xdm-display-manager.patch: pull xdm.service instead of display-manager.service (needed until xdm initscript is migrated to native systemd service). - Add fix-permissions-btmp.patch: ensure btmp is owned only by root (bnc#777405). - Have the udev package create a tape group, as referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules (DimStar). - Add fix-bad-memory-access.patch: fix crash in journal rotation. - Add fix-dbus-crash.patch: fix D-Bus caused crash. - Add sync-on-shutdown.patch: ensure sync is done when initiating shutdown. - Add mount-efivars.patch: mount efivars if booting on UEFI. - Ship a empty systemd-journald initscript in systemd-logger to stop insserv to complain about missing syslog dependency. - Update 0001-service-Fix-dependencies-added-when-parsing-insserv..patch with bug fixes from Debian. old: Base:System/systemd new: home:fcrozat:branches:Base:System/systemd rev NoneIndex: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch =================================================================== --- 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 311) +++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 5) @@ -1,17 +1,35 @@ -From 6620bceb7233a830be3635a4f7a7dc75c13a9c8e Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Fri, 30 Sep 2011 14:12:45 +0200 -Subject: [PATCH] service: Fix dependencies added when parsing insserv.conf - ---- - src/service.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -Index: systemd-41/src/service.c +Index: systemd-195/src/core/service.c =================================================================== ---- systemd-41.orig/src/core/service.c -+++ systemd-41/src/core/service.c -@@ -3210,23 +3210,30 @@ static void sysv_facility_in_insserv_con +--- systemd-195.orig/src/core/service.c ++++ systemd-195/src/core/service.c +@@ -3391,12 +3391,13 @@ static void service_notify_message(Unit + + #ifdef HAVE_SYSV_COMPAT + +-#ifdef TARGET_SUSE +-static void sysv_facility_in_insserv_conf(Manager *mgr) { +- FILE *f=NULL; ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) ++static void sysv_parse_insserv_conf(Manager *mgr, const char* filename) { ++ FILE *f = NULL; + int r; + +- if (!(f = fopen("/etc/insserv.conf", "re"))) { ++ if (!(f = fopen(filename, "re"))) { ++ log_error("Failed to open file %s", filename); + r = errno == ENOENT ? 0 : -errno; + goto finish; + } +@@ -3410,7 +3411,7 @@ static void sysv_facility_in_insserv_con + break; + + r = -errno; +- log_error("Failed to read configuration file '/etc/insserv.conf': %s", strerror(-r)); ++ log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); + goto finish; + } + +@@ -3425,23 +3426,30 @@ static void sysv_facility_in_insserv_con Unit *u; if (sysv_translate_facility(parsed[0], NULL, &facility) < 0) continue; @@ -29,12 +47,12 @@ STRV_FOREACH (j, parsed+1) { - if (*j[0]=='+') { - e = UNIT_WANTS; -+ if (*j[0]=='+') ++ if (*j[0] == '+') name = *j+1; - } - else { - e = UNIT_REQUIRES; -+ else ++ else name = *j; - } + if (streq(name, "boot.localfs") || @@ -44,9 +62,54 @@ continue; - r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, e, dep, NULL, true); -+ r = unit_add_dependency_by_name_inverse(u, UNIT_BEFORE, dep, NULL, true); -+ if (*j[0]!='+') ++ r = unit_add_two_dependencies_by_name_inverse(u, UNIT_WANTS, UNIT_BEFORE, dep, NULL, true); ++ if (*j[0] != '+') + r = unit_add_dependency_by_name(u, UNIT_REQUIRES, dep, NULL, true); free(dep); } } +@@ -3454,6 +3462,35 @@ finish: + fclose(f); + + } ++ ++static void sysv_facility_in_insserv_conf(Manager *mgr) { ++ DIR *d =NULL; ++ struct dirent *de; ++ ++#ifdef TARGET_DEBIAN ++ if (!(d = opendir("/etc/insserv.conf.d/"))) ++ if (errno != ENOENT) { ++ log_warning("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); ++ goto finish; ++ } ++ ++ while ((de = readdir(d))) { ++ char *path = NULL; ++ if (ignore_file(de->d_name)) ++ continue; ++ ++ path = join("/etc/insserv.conf.d/", de->d_name, NULL); ++ sysv_parse_insserv_conf(mgr, path); ++ free(path); ++ } ++finish: ++ if (d) ++ closedir(d); ++#endif ++ ++ sysv_parse_insserv_conf(mgr, "/etc/insserv.conf"); ++} ++ + #endif + + static int service_enumerate(Manager *m) { +@@ -3604,7 +3641,7 @@ static int service_enumerate(Manager *m) + + r = 0; + +-#ifdef TARGET_SUSE ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) + sysv_facility_in_insserv_conf (m); + #endif + Index: systemd-mini.changes =================================================================== --- systemd-mini.changes (revision 311) +++ systemd-mini.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd-mini.spec =================================================================== --- systemd-mini.spec (revision 311) +++ systemd-mini.spec (revision 5) @@ -102,6 +102,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -128,6 +129,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -137,6 +140,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -151,8 +162,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -313,6 +322,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -337,6 +347,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -368,8 +384,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -378,11 +400,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -392,7 +409,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -415,8 +432,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -442,8 +458,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -532,6 +552,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -724,6 +746,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -787,7 +813,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -878,6 +908,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: systemd.changes =================================================================== --- systemd.changes (revision 311) +++ systemd.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd.spec =================================================================== --- systemd.spec (revision 311) +++ systemd.spec (revision 5) @@ -97,6 +97,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -123,6 +124,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -132,6 +135,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -146,8 +157,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -308,6 +317,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -332,6 +342,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -363,8 +379,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -373,11 +395,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -387,7 +404,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -410,8 +427,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -437,8 +453,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -527,6 +547,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -719,6 +741,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -782,7 +808,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -873,6 +903,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: fix-bad-memory-access.patch =================================================================== --- fix-bad-memory-access.patch (added) +++ fix-bad-memory-access.patch (revision 5) @@ -0,0 +1,23 @@ +From 7d73c1343be02a59b17de0cd34375deeb815d89c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 20 Nov 2012 00:19:27 +0100 +Subject: [PATCH] journald: fix bad memory access + +https://bugzilla.redhat.com/show_bug.cgi?id=875653 +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: systemd-195/src/journal/journald.c +=================================================================== +--- systemd-195.orig/src/journal/journald.c ++++ systemd-195/src/journal/journald.c +@@ -342,7 +342,7 @@ static void server_rotate(Server *s) { + HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { + r = journal_file_rotate(&f, s->compress, s->seal); + if (r < 0) +- if (f->path) ++ if (f) + log_error("Failed to rotate %s: %s", f->path, strerror(-r)); + else + log_error("Failed to create user journal: %s", strerror(-r)); Index: fix-dbus-crash.patch =================================================================== --- fix-dbus-crash.patch (added) +++ fix-dbus-crash.patch (revision 5) @@ -0,0 +1,32 @@ +From 645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Wed, 31 Oct 2012 11:53:56 +0100 +Subject: [PATCH] dbus-manager: fix a fatal dbus abort in + bus_manager_message_handler() + +If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref() +will be called twice on "reply", causing systemd to crash. So remove +the call to dbus_message_unref(); it is unnecessary because of +the cleanup attribute on "reply". + +[zj: modified to leave one dbus_message_unref() alone, per Colin +Walters' comment.] +--- + src/core/dbus-manager.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index 2010241..3cf3e90 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -1436,7 +1436,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h); + if (r < 0) { + unit_file_list_free(h); +- dbus_message_unref(reply); + return bus_send_error_reply(connection, message, NULL, r); + } + +-- +1.7.10.4 + Index: fix-permissions-btmp.patch =================================================================== --- fix-permissions-btmp.patch (added) +++ fix-permissions-btmp.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-44/tmpfiles.d/systemd.conf +=================================================================== +--- systemd-44.orig/tmpfiles.d/systemd.conf ++++ systemd-44/tmpfiles.d/systemd.conf +@@ -11,7 +11,7 @@ d /run/user 0755 root root 10d + F /run/utmp 0664 root utmp - + + f /var/log/wtmp 0664 root utmp - +-f /var/log/btmp 0600 root utmp - ++f /var/log/btmp 0600 root root - + + d /var/cache/man - - - 30d + Index: mount-efivars.patch =================================================================== --- mount-efivars.patch (added) +++ mount-efivars.patch (revision 5) @@ -0,0 +1,336 @@ +From f271dd97622b656c1c013d181ea615c671cc2438 Mon Sep 17 00:00:00 2001 +From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> +Date: Sat, 27 Oct 2012 11:23:22 +0800 +Subject: [PATCH] systemd: mount the EFI variable filesystem +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add efivarfs to the mount_table in mount-setup.c, so the EFI variable +filesystem will be mounted when systemd executed. + +The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel. + +Cc: Kay Sievers <kay@vrfy.org> +Cc: Lennart Poettering <lennart@poettering.net> +Cc: Mantas Mikulėnas <grawity@gmail.com> +Cc: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> +Cc: Matt Fleming <matt.fleming@intel.com> +Cc: Jeremy Kerr <jeremy.kerr@canonical.com> +Cc: Matthew Garrett <mjg@redhat.com> +Signed-off-by: Lee, Chun-Yi <jlee@suse.com> +--- + src/core/kmod-setup.c | 7 ++++--- + src/core/mount-setup.c | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index cc2a2d9..ce8a8e7 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -31,9 +31,10 @@ + #include "kmod-setup.h" + + static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "unix", "/proc/net/unix" ++ "autofs4", "/sys/class/misc/autofs", ++ "ipv6", "/sys/module/ipv6", ++ "efivarfs", "/sys/firmware/efi/efivars", ++ "unix", "/proc/net/unix" + }; + + #pragma GCC diagnostic push +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 0fd112f..9894c7f 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, + { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, + { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +-- +1.7.10.4 + +From c1e5704657315b436c0409e8172c1fcb76adccad Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:06:27 +0100 +Subject: [PATCH] shared: add is_efiboot() + +--- + src/shared/util.c | 4 ++++ + src/shared/util.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 2a8afae..9983695 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -77,6 +77,10 @@ char **saved_argv = NULL; + static volatile unsigned cached_columns = 0; + static volatile unsigned cached_lines = 0; + ++bool is_efiboot(void) { ++ return access("/sys/firmware/efi", F_OK) >= 0; ++} ++ + size_t page_size(void) { + static __thread size_t pgsz = 0; + long r; +diff --git a/src/shared/util.h b/src/shared/util.h +index e387b12..99972cc 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -90,6 +90,8 @@ union dirent_storage { + #define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m" + #define ANSI_HIGHLIGHT_OFF "\x1B[0m" + ++bool is_efiboot(void); ++ + usec_t now(clockid_t clock); + + dual_timestamp* dual_timestamp_get(dual_timestamp *ts); +-- +1.7.10.4 + +From 1022373284b7562431fb0a6dba45db8af089a0e3 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:54:19 +0100 +Subject: [PATCH] kmod-setup: add conditional module loading callback + +--- + src/core/kmod-setup.c | 32 ++++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index ce8a8e7..383a6b2 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -30,11 +30,17 @@ + + #include "kmod-setup.h" + +-static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "efivarfs", "/sys/firmware/efi/efivars", +- "unix", "/proc/net/unix" ++typedef struct Kmodule { ++ const char *name; ++ const char *directory; ++ bool (*condition_fn)(void); ++} KModule; ++ ++static const KModule kmod_table[] = { ++ { "autofs4", "/sys/class/misc/autofs", NULL } , ++ { "ipv6", "/sys/module/ipv6", NULL }, ++ { "efivarfs", "/sys/firmware/efi/efivars", NULL }, ++ { "unix", "/proc/net/unix", NULL } , + }; + + #pragma GCC diagnostic push +@@ -42,7 +48,8 @@ static const char * const kmod_table[] = { + static void systemd_kmod_log(void *data, int priority, const char *file, int line, + const char *fn, const char *format, va_list args) + { +- log_metav(priority, file, line, fn, format, args); ++ /* library logging is enabled at debug only */ ++ log_metav(LOG_DEBUG, file, line, fn, format, args); + } + #pragma GCC diagnostic pop + +@@ -53,13 +60,15 @@ int kmod_setup(void) { + int err; + + for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) { ++ if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn()) ++ continue; + +- if (access(kmod_table[i+1], F_OK) >= 0) ++ if (access(kmod_table[i].directory, F_OK) >= 0) + continue; + + log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. " + "We'll now try to work around this by loading the module...", +- kmod_table[i]); ++ kmod_table[i].name); + + if (!ctx) { + ctx = kmod_new(NULL, NULL); +@@ -69,13 +78,12 @@ int kmod_setup(void) { + } + + kmod_set_log_fn(ctx, systemd_kmod_log, NULL); +- + kmod_load_resources(ctx); + } + +- err = kmod_module_new_from_name(ctx, kmod_table[i], &mod); ++ err = kmod_module_new_from_name(ctx, kmod_table[i].name, &mod); + if (err < 0) { +- log_error("Failed to load module '%s'", kmod_table[i]); ++ log_error("Failed to lookup module '%s'", kmod_table[i].name); + continue; + } + +@@ -85,7 +93,7 @@ int kmod_setup(void) { + else if (err == KMOD_PROBE_APPLY_BLACKLIST) + log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); + else +- log_error("Failed to insert '%s'", kmod_module_get_name(mod)); ++ log_error("Failed to insert module '%s'", kmod_module_get_name(mod)); + + kmod_module_unref(mod); + } +-- +1.7.10.4 + +From 3dfb265083347cb5700dc38f7cc0f479f378e6e9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:55:23 +0100 +Subject: [PATCH] kmod-setup: mounting efivarfs, *after* we tried to mount it, + is pointless + +The mount() system call, which we issue before loading modules, will trigger +a modprobe by the kernel and block until it returns. Trying to load it again +later, will have exactly the same result as the first time. +--- + src/core/kmod-setup.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 383a6b2..20ab232 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -39,7 +39,6 @@ typedef struct Kmodule { + static const KModule kmod_table[] = { + { "autofs4", "/sys/class/misc/autofs", NULL } , + { "ipv6", "/sys/module/ipv6", NULL }, +- { "efivarfs", "/sys/firmware/efi/efivars", NULL }, + { "unix", "/proc/net/unix", NULL } , + }; + +-- +1.7.10.4 + +From 6aa220e019f9dffd96590b06b68f937985204109 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 17:03:48 +0100 +Subject: [PATCH] mount-setup: try mounting 'efivarfs' only if the system + bootet with EFI + +--- + TODO | 3 --- + src/core/mount-setup.c | 50 ++++++++++++++++++++++++++++++++---------------- + 2 files changed, 34 insertions(+), 19 deletions(-) + +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 9894c7f..98614d0 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -46,14 +46,20 @@ + #define TTY_GID 5 + #endif + ++typedef enum MountMode { ++ MNT_NONE = 0, ++ MNT_FATAL = 1 << 0, ++ MNT_IN_CONTAINER = 1 << 1, ++} MountMode; ++ + typedef struct MountPoint { + const char *what; + const char *where; + const char *type; + const char *options; + unsigned long flags; +- bool fatal; +- bool in_container; ++ bool (*condition_fn)(void); ++ MountMode mode; + } MountPoint; + + /* The first three entries we might need before SELinux is up. The +@@ -62,16 +68,26 @@ typedef struct MountPoint { + #define N_EARLY_MOUNT 4 + + static const MountPoint mount_table[] = { +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, +- { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, +- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, false, true }, +- { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, true }, ++ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_NONE }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ is_efiboot, MNT_NONE }, ++ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, ++ NULL, MNT_IN_CONTAINER }, ++ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_IN_CONTAINER }, ++ { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_IN_CONTAINER }, + }; + + /* These are API file systems that might be mounted by other software, +@@ -119,6 +135,9 @@ static int mount_one(const MountPoint *p, bool relabel) { + + assert(p); + ++ if (p->condition_fn && !p->condition_fn()) ++ return 0; ++ + /* Relabel first, just in case */ + if (relabel) + label_fix(p->where, true, true); +@@ -131,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) { + return 0; + + /* Skip securityfs in a container */ +- if (!p->in_container && detect_container(NULL) > 0) ++ if (!(p->mode & MNT_IN_CONTAINER) && detect_container(NULL) > 0) + return 0; + + /* The access mode here doesn't really matter too much, since +@@ -149,8 +168,8 @@ static int mount_one(const MountPoint *p, bool relabel) { + p->type, + p->flags, + p->options) < 0) { +- log_full(p->fatal ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); +- return p->fatal ? -errno : 0; ++ log_full((p->mode & MNT_FATAL) ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); ++ return (p->mode & MNT_FATAL) ? -errno : 0; + } + + /* Relabel again, since we now mounted something fresh here */ +@@ -289,7 +308,6 @@ int mount_cgroup_controllers(char ***join_controllers) { + p.type = "cgroup"; + p.options = options; + p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV; +- p.fatal = false; + + r = mount_one(&p, true); + free(controller); +-- +1.7.10.4 + Index: sync-on-shutdown.patch =================================================================== --- sync-on-shutdown.patch (added) +++ sync-on-shutdown.patch (revision 5) @@ -0,0 +1,49 @@ +From 0049f05a8bb82c3e084bacc5945596761d706c55 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 16 Nov 2012 01:30:29 +0100 +Subject: [PATCH] shutdown: readd explicit sync() when shutting down + +As it turns out reboot() doesn't actually imply a file system sync, but +only a disk sync. Accordingly, readd explicit sync() invocations +immediately before we invoke reboot(). + +This is much less dramatic than it might sounds as we umount all +disks/read-only remount them anyway before going down. +--- + src/core/service.c | 1 + + src/core/shutdown.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/core/service.c b/src/core/service.c +index cf08485..df72aba 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2485,6 +2485,7 @@ static int service_start_limit_test(Service *s) { + + case SERVICE_START_LIMIT_REBOOT_IMMEDIATE: + log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id); ++ sync(); + reboot(RB_AUTOBOOT); + break; + +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index cc8c57b..b59aef1 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -273,6 +273,13 @@ int main(int argc, char *argv[]) { + } + } + ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. So let's do this here, but not ++ * needlessly slow down containers. */ ++ if (!in_container) ++ sync(); ++ + if (cmd == LINUX_REBOOT_CMD_KEXEC) { + + if (!in_container) { +-- +1.7.10.4 + Index: systemd-journald.init =================================================================== --- systemd-journald.init (added) +++ systemd-journald.init (revision 5) @@ -0,0 +1,33 @@ +#! /bin/sh +# +# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# /etc/init.d/systemd-journald +# +### BEGIN INIT INFO +# Provides: syslog +# Required-Start: $null +# Required-Stop: $null +# Default-Start: 2 3 5 +# Default-Stop: +# Short-Description: compat wrapper for journald +# Description: compat wrapper for journald +### END INIT INFO + +. /etc/rc.status + +rc_reset + +case "$1" in + start|stop|restart) + rc_failed 3 + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +rc_exit Index: xdm-display-manager.patch =================================================================== --- xdm-display-manager.patch (added) +++ xdm-display-manager.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-195/units/graphical.target +=================================================================== +--- systemd-195.orig/units/graphical.target ++++ systemd-195/units/graphical.target +@@ -11,7 +11,7 @@ Documentation=man:systemd.special(7) + Requires=multi-user.target + After=multi-user.target + Conflicts=rescue.target +-Wants=display-manager.service ++Wants=xdm.service + AllowIsolate=yes + + [Install] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=312
2012-11-20 13:10:12 +01:00
# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
getent group tape >/dev/null || groupadd -r tape 2> /dev/null || :
- Don't hardcode path for systemctl in udev post script. - Ensure systemd-udevd.service is shadowing boot.udev when booting under systemd. - Fix udev daemon upgrade under both systemd and sysvinit. - Add fix-logind-pty-seat.patch: fix logind complaining when doing su/sudo in X terminal. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=307
2012-11-05 19:33:03 +01:00
# kill daemon if we are not in a chroot
if test -f /proc/1/exe -a -d /proc/1/root ; then
if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then
systemctl stop systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udevd.service udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1 || :
udevadm control --exit 2>&1 || :
fi
fi
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%post -n %{udevpkgname}
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
/usr/bin/udevadm hwdb --update >/dev/null 2>&1 || :
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{fillup_and_insserv -Y boot.udev}
# add KERNEL name match to existing persistent net rules
sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
/etc/udev/rules.d/70-persistent-net.rules >/dev/null 2>&1 || :
# cleanup old stuff
rm -f /etc/sysconfig/udev
rm -f /etc/udev/rules.d/20-cdrom.rules
rm -f /etc/udev/rules.d/55-cdrom.rules
rm -f /etc/udev/rules.d/65-cdrom.rules
- Don't hardcode path for systemctl in udev post script. - Ensure systemd-udevd.service is shadowing boot.udev when booting under systemd. - Fix udev daemon upgrade under both systemd and sysvinit. - Add fix-logind-pty-seat.patch: fix logind complaining when doing su/sudo in X terminal. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=307
2012-11-05 19:33:03 +01:00
systemctl daemon-reload >/dev/null 2>&1 || :
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
# start daemon if we are not in a chroot
if test -f /proc/1/exe -a -d /proc/1/root; then
if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then
- Don't hardcode path for systemctl in udev post script. - Ensure systemd-udevd.service is shadowing boot.udev when booting under systemd. - Fix udev daemon upgrade under both systemd and sysvinit. - Add fix-logind-pty-seat.patch: fix logind complaining when doing su/sudo in X terminal. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=307
2012-11-05 19:33:03 +01:00
if ! systemctl start systemd-udevd.service >/dev/null 2>&1; then
/usr/lib/systemd/systemd-udevd --daemon >/dev/null 2>&1 || :
fi
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
fi
fi
- Fix creation of /dev/root link. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=314
2012-11-22 15:32:12 +01:00
if [ "${YAST_IS_RUNNING}" != "instsys" ]; then
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
- Fix creation of /dev/root link. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=314
2012-11-22 15:32:12 +01:00
echo "Skipping recreation of existing initial ramdisks, due"
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=597
2014-04-16 12:17:08 +02:00
%if %{defined regenerate_initrd_post}
else
%regenerate_initrd_post
%else
- Fix creation of /dev/root link. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=314
2012-11-22 15:32:12 +01:00
elif [ -x /sbin/mkinitrd ]; then
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
/sbin/mkinitrd || :
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=597
2014-04-16 12:17:08 +02:00
%endif
- Fix creation of /dev/root link. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=314
2012-11-22 15:32:12 +01:00
fi
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
fi
%postun -n %{udevpkgname}
%insserv_cleanup
- Don't hardcode path for systemctl in udev post script. - Ensure systemd-udevd.service is shadowing boot.udev when booting under systemd. - Fix udev daemon upgrade under both systemd and sysvinit. - Add fix-logind-pty-seat.patch: fix logind complaining when doing su/sudo in X terminal. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=307
2012-11-05 19:33:03 +01:00
systemctl daemon-reload >/dev/null 2>&1 || :
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
- Fix creation of /dev/root link. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=314
2012-11-22 15:32:12 +01:00
if [ "${YAST_IS_RUNNING}" != "instsys" ]; then
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
- Fix creation of /dev/root link. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=314
2012-11-22 15:32:12 +01:00
echo "Skipping recreation of existing initial ramdisks, due"
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=597
2014-04-16 12:17:08 +02:00
%if %{defined regenerate_initrd_post}
else
%regenerate_initrd_post
%else
- Fix creation of /dev/root link. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=314
2012-11-22 15:32:12 +01:00
elif [ -x /sbin/mkinitrd ]; then
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
/sbin/mkinitrd || :
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=597
2014-04-16 12:17:08 +02:00
%endif
- Fix creation of /dev/root link. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=314
2012-11-22 15:32:12 +01:00
fi
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
fi
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=597
2014-04-16 12:17:08 +02:00
%if %{defined regenerate_initrd_post}
%posttrans -n %{udevpkgname}
%regenerate_initrd_posttrans
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
%postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
%if ! 0%{?bootstrap}
%post -n libgudev-1_0-0 -p /sbin/ldconfig
%postun -n libgudev-1_0-0 -p /sbin/ldconfig
- Ensure journal is flushed on disk when systemd-logger is installed for the first time. - Add improve-journal-perf.patch: improve journal performance on query. - Add support-hybrid-suspend.patch: add support for hybrid suspend. - Add forward-to-pmutils.patch: forward suspend/hibernation calls to pm-utils, if installed (bnc#790157). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=353
2013-02-20 09:34:16 +01:00
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
%if %{with permission}
%verifyscript logger
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
%verify_permissions -e %{_localstatedir}/log/journal/
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
%pre logger
getent group systemd-journal >/dev/null || groupadd -r systemd-journal || :
exit 0
- Ensure journal is flushed on disk when systemd-logger is installed for the first time. - Add improve-journal-perf.patch: improve journal performance on query. - Add support-hybrid-suspend.patch: add support for hybrid suspend. - Add forward-to-pmutils.patch: forward suspend/hibernation calls to pm-utils, if installed (bnc#790157). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=353
2013-02-20 09:34:16 +01:00
%post logger
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
%if %{with permission}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
%set_permissions %{_localstatedir}/log/journal/
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=751
2014-08-18 16:41:57 +02:00
%if %{with systemgrps}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
2014-06-06 13:40:36 +02:00
getent group wheel && setfacl -Rnm g:wheel:rx,d:g:wheel:rx %{_localstatedir}/log/journal/ > /dev/null 2>&1 || :
getent group adm && setfacl -Rnm g:adm:rx,d:g:adm:rx %{_localstatedir}/log/journal/ > /dev/null 2>&1 || :
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=751
2014-08-18 16:41:57 +02:00
%endif
- Ensure journal is flushed on disk when systemd-logger is installed for the first time. - Add improve-journal-perf.patch: improve journal performance on query. - Add support-hybrid-suspend.patch: add support for hybrid suspend. - Add forward-to-pmutils.patch: forward suspend/hibernation calls to pm-utils, if installed (bnc#790157). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=353
2013-02-20 09:34:16 +01:00
if [ "$1" -eq 1 ]; then
# tell journal to start logging on disk if directory didn't exist before
systemctl --no-block restart systemd-journal-flush.service >/dev/null 2>&1 || :
fi
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%preun -n nss-myhostname
if [ "$1" -eq 0 -a -f /etc/nsswitch.conf ] ; then
%{_sbindir}/nss-myhostname-config --disable
fi
%post -n nss-myhostname -p /sbin/ldconfig
%postun -n nss-myhostname -p /sbin/ldconfig
- Move systemd-journal-gateway to subpackage to lower dependencies in default install. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=417
2013-07-25 17:40:51 +02:00
%pre journal-gateway
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d %{_localstatedir}/log/journal/ -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || :
- Move systemd-journal-gateway to subpackage to lower dependencies in default install. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=417
2013-07-25 17:40:51 +02:00
getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || :
%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
exit 0
%post journal-gateway
%service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
%preun journal-gateway
%service_del_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
%postun journal-gateway
%service_del_postun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
%files -f systemd.lang
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%defattr(-,root,root)
/bin/systemd
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
/bin/systemd-ask-password
/bin/systemctl
add feature 316824 and address bug 869142 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=573
2014-03-25 14:47:22 +01:00
%{_bindir}/systemd-sleep-grub
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%{_bindir}/busctl
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%{_bindir}/kernel-install
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
%{_bindir}/hostnamectl
%{_bindir}/localectl
- Update to release 205: + two new unit types have been introduced: - Scope units are very similar to service units, however, are created out of pre-existing processes -- instead of PID 1 forking off the processes. - Slice units may be used to partition system resources in an hierarchial fashion and then assign other units to them. By default there are now three slices: system.slice (for all system services), user.slice (for all user sessions), machine.slice (for VMs and containers). + new concept of "transient" units, which are created at runtime using an API and not based on configuration from disk. + logind has been updated to make use of scope and slice units to manage user sessions. Logind will no longer create cgroups hierchies itself but will relying on PID 1. + A new mini-daemon "systemd-machined" has been added which may be used by virtualization managers to register local VMs/containers. machinectl tool has been added to query meta-data from systemd-machined. + Low-level cgroup configuration options ControlGroup=, ControlGroupModify=, ControlGroupPersistent=, ControlGroupAttribute= have been removed. High-level attribute settings or slice units should be used instead? + A new bus call SetUnitProperties() has been added to alter various runtime parameters of a unit, including cgroup parameters. systemctl gained set-properties command to wrap this call. + A new tool "systemd-run" has been added which can be used to run arbitrary command lines as transient services or scopes, while configuring a number of settings via the command OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=412
2013-07-04 17:28:49 +02:00
%{_bindir}/machinectl
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_bindir}/systemctl
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%{_bindir}/systemd-analyze
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
%{_bindir}/systemd-coredumpctl
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_bindir}/systemd-delta
%{_bindir}/systemd-notify
- Update to release 205: + two new unit types have been introduced: - Scope units are very similar to service units, however, are created out of pre-existing processes -- instead of PID 1 forking off the processes. - Slice units may be used to partition system resources in an hierarchial fashion and then assign other units to them. By default there are now three slices: system.slice (for all system services), user.slice (for all user sessions), machine.slice (for VMs and containers). + new concept of "transient" units, which are created at runtime using an API and not based on configuration from disk. + logind has been updated to make use of scope and slice units to manage user sessions. Logind will no longer create cgroups hierchies itself but will relying on PID 1. + A new mini-daemon "systemd-machined" has been added which may be used by virtualization managers to register local VMs/containers. machinectl tool has been added to query meta-data from systemd-machined. + Low-level cgroup configuration options ControlGroup=, ControlGroupModify=, ControlGroupPersistent=, ControlGroupAttribute= have been removed. High-level attribute settings or slice units should be used instead? + A new bus call SetUnitProperties() has been added to alter various runtime parameters of a unit, including cgroup parameters. systemctl gained set-properties command to wrap this call. + A new tool "systemd-run" has been added which can be used to run arbitrary command lines as transient services or scopes, while configuring a number of settings via the command OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=412
2013-07-04 17:28:49 +02:00
%{_bindir}/systemd-run
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_bindir}/systemd-journalctl
%{_bindir}/journalctl
%{_bindir}/systemd-ask-password
%{_bindir}/loginctl
%{_bindir}/systemd-loginctl
%{_bindir}/systemd-inhibit
%{_bindir}/systemd-tty-ask-password-agent
%{_bindir}/systemd-tmpfiles
%{_bindir}/systemd-machine-id-setup
%{_bindir}/systemd-nspawn
%{_bindir}/systemd-stdio-bridge
%{_bindir}/systemd-detect-virt
- Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. - Update storage-after-cryptsetup.patch with new systemctl path. - Migrate broken symlinks in /etc/systemd/system due to new systemd location. - Update to release 195: + journalctl agained --since and --until, as well as filtering for units with --unit=/-u. + allow ExecReload properly for Type=oneshot (needed for iptables.service, rpc-nfsd.service). + journal daemon supports time-based rotation and vaccuming. + journalctl -F allow to list all values of a certain field in journal database. + new commandline clients for timedated, locald and hostnamed + new tool systemd-coredumpctl to list and extract coredumps from journal. + improve gatewayd: follow mode, filtering, support for HTML5/JSON Server-Sent-Events. + reload support in SysV initscripts is now detected when file is parted. + "systemctl status --follow" as been removed, use "journalctl -fu instead" + journald.conf RuntimeMinSize and PersistentMinSize settings have been removed. - Add compatibility symlink for systemd-ask-password and systemctl in /bin. - Add var-run-lock.patch: make sure /var/run and /var/lock are handled as bind mount if they aren't symlinks. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=301
2012-10-29 19:55:30 +01:00
%{_bindir}/timedatectl
- Handle disable_capslock, compose table and kbd_rate - Add rpm macros.systemd file. - Do not disable klogd, it has its own service now. - Handle kexec correctly (bnc#671673). - Disable preload services, they are conflicting with systemd. >>>>>>> .new OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=181
2011-08-23 18:14:51 +02:00
%{_sbindir}/systemd-sysv-convert
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%{_libdir}/libsystemd.so.*
%if %{with compat_libs}
Update to v31 - to not push into factory yet OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=163
2011-07-28 12:59:10 +02:00
%{_libdir}/libsystemd-daemon.so.*
%{_libdir}/libsystemd-login.so.*
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
%{_libdir}/libsystemd-id128.so.*
%{_libdir}/libsystemd-journal.so.*
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%endif
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%{_bindir}/systemd-cgls
- Update to version 39: + New systemd-cgtop tool to show control groups by their resource usage. + Linking against libacl for ACLs is optional again. + If a group "adm" exists, journal files are automatically owned by them, thus allow members of this group full access to the system journal as well as all user journals. + The journal now stores the SELinux context of the logging client for all entries. + Add C++ inclusion guards to all public headers. + New output mode "cat" in the journal to print only text messages, without any meta data like date or time. + Include tiny X server wrapper as a temporary stop-gap to teach XOrg udev display enumeration (until XOrg supports udev hotplugging for display devices). + Add new systemd-cat tool for executing arbitrary programs with STDERR/STDOUT connected to the journal. Can also act as BSD logger replacement, and does so by default. + Optionally store all locally generated coredumps in the journal along with meta data. + systemd-tmpfiles learnt four new commands: n, L, c, b, for writing short strings to files (for usage for /sys), and for creating symlinks, character and block device nodes. + New unit file option ControlGroupPersistent= to make cgroups persistent. + Support multiple local RTCs in a sane way. + No longer monopolize IO when replaying readahead data on rotating disks. + Don't show kernel threads in systemd-cgls anymore, unless requested with new -k switch. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=234
2012-01-25 15:08:16 +01:00
%{_bindir}/systemd-cgtop
%{_bindir}/systemd-cat
- Update to release 204: + systemd-nspawn creates etc/resolv.conf in container if needed. + systemd-nspawn will store metadata about container in container cgroup including its root directory. + cgroup hierarchy has been reworked, all objects are now suffxed (with .session for user sessions, .user for users, .nspawn for containers). All cgroup names are now escaped to preven collision of object names. + systemctl list-dependencies gained --plain, --reverse, --after and --before switches. + systemd-inhibit shows processes name taking inhibitor lock. + nss-myhostname will now resolve "localhost" implicitly. + .include is not allowed recursively anymore and only in unit files. Drop-in files should be favored in most cases. + systemd-analyze gained "critical-chain" command, to get slowest chain of units run during boot-up. + systemd-nspawn@.service has been added to easily run nspawn container for system services. Just start "systemd-nspawn@foobar.service" and container from /var/lib/container/foobar" will be booted. + systemd-cgls has new --machine parameter to list processes from one container. + ConditionSecurity= can now check for apparmor and SMACK. + /etc/systemd/sleep.conf has been introduced to configure which kernel operation will be execute when "suspend", "hibernate" or "hybrid-sleep" is requrested. It allow new kernel "freeze" state to be used too. (This setting won't have any effect if pm-utils is installed). + ENV{SYSTEMD_WANTS} in udev rules will now implicitly escape passed argument if applicable. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=388
2013-05-29 17:26:40 +02:00
%dir %{_prefix}/lib/kernel
%dir %{_prefix}/lib/kernel/install.d
%{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%dir %{_prefix}/lib/systemd
%dir %{_prefix}/lib/systemd/user
%dir %{_prefix}/lib/systemd/system
%exclude %{_prefix}/lib/systemd/system/systemd-udev*.*
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=560
2014-03-14 12:10:20 +01:00
%exclude %{_prefix}/lib/systemd/system/udev.service
%exclude %{_prefix}/lib/systemd/system/initrd-udevadm-cleanup-db.service
- udev: Fix device matching in the accelerometer add: 1019-udev-Fix-device-matching-in-the-accelerometer.patch - keymap: add aditional support for some keyboard keys add: 1018-keymap-add-aditional-support.patch - rename udev-root-symlink.service to systemd-udev-root-symlink.service. - udev: Fix device matching in the accelerometer add: 1019-udev-Fix-device-matching-in-the-accelerometer.patch - keymap: add aditional support for some keyboard keys add: 1018-keymap-add-aditional-support.patch - rename udev-root-symlink.service to systemd-udev-root-symlink.service. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=335
2013-01-29 14:40:40 +01:00
%exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.*
- New root symlink rule generator Add 1096-new-udev-root-symlink-generator.patch - Remove write_dev_root_rule and systemd-udev-root-symlink - New root symlink rule generator Add 1096-new-udev-root-symlink-generator.patch - Remove write_dev_root_rule and systemd-udev-root-symlink OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=816
2014-11-14 13:19:40 +01:00
%exclude %{_prefix}/lib/systemd/system/sysinit.target.wants/systemd-udev-root-symlink.service
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%if ! 0%{?bootstrap}
- Move systemd-journal-gateway to subpackage to lower dependencies in default install. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=417
2013-07-25 17:40:51 +02:00
%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_prefix}/lib/systemd/system/*.automount
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%{_prefix}/lib/systemd/system/*.busname
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_prefix}/lib/systemd/system/*.service
- Update to release 205: + two new unit types have been introduced: - Scope units are very similar to service units, however, are created out of pre-existing processes -- instead of PID 1 forking off the processes. - Slice units may be used to partition system resources in an hierarchial fashion and then assign other units to them. By default there are now three slices: system.slice (for all system services), user.slice (for all user sessions), machine.slice (for VMs and containers). + new concept of "transient" units, which are created at runtime using an API and not based on configuration from disk. + logind has been updated to make use of scope and slice units to manage user sessions. Logind will no longer create cgroups hierchies itself but will relying on PID 1. + A new mini-daemon "systemd-machined" has been added which may be used by virtualization managers to register local VMs/containers. machinectl tool has been added to query meta-data from systemd-machined. + Low-level cgroup configuration options ControlGroup=, ControlGroupModify=, ControlGroupPersistent=, ControlGroupAttribute= have been removed. High-level attribute settings or slice units should be used instead? + A new bus call SetUnitProperties() has been added to alter various runtime parameters of a unit, including cgroup parameters. systemctl gained set-properties command to wrap this call. + A new tool "systemd-run" has been added which can be used to run arbitrary command lines as transient services or scopes, while configuring a number of settings via the command OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=412
2013-07-04 17:28:49 +02:00
%{_prefix}/lib/systemd/system/*.slice
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_prefix}/lib/systemd/system/*.target
%{_prefix}/lib/systemd/system/*.mount
%{_prefix}/lib/systemd/system/*.timer
%{_prefix}/lib/systemd/system/*.socket
%{_prefix}/lib/systemd/system/*.wants
%{_prefix}/lib/systemd/system/*.path
%{_prefix}/lib/systemd/user/*.target
%{_prefix}/lib/systemd/user/*.service
%exclude %{_prefix}/lib/systemd/systemd-udevd
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%if ! 0%{?bootstrap}
- Move systemd-journal-gateway to subpackage to lower dependencies in default install. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=417
2013-07-25 17:40:51 +02:00
%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_prefix}/lib/systemd/systemd-*
%{_prefix}/lib/systemd/systemd
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%dir %{_prefix}/lib/systemd/catalog
%{_prefix}/lib/systemd/catalog/systemd.catalog
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%{_prefix}/lib/systemd/catalog/systemd.*.catalog
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%dir %{_prefix}/lib/systemd/system-shutdown
%dir %{_prefix}/lib/systemd/system-preset
%dir %{_prefix}/lib/systemd/user-preset
%dir %{_prefix}/lib/systemd/system-generators
%dir %{_prefix}/lib/systemd/user-generators
%dir %{_prefix}/lib/systemd/ntp-units.d/
%dir %{_prefix}/lib/systemd/system-shutdown/
%dir %{_prefix}/lib/systemd/system-sleep/
%dir %{_prefix}/lib/systemd/system/default.target.wants
%dir %{_prefix}/lib/systemd/system/dbus.target.wants
- Use drop-in file to fix bnc#804158. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=370
2013-04-25 09:23:12 +02:00
%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d
%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if ! 0%{?bootstrap}
%{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
%endif
- Do not build EFI support code in architectures on which the kernel does not support CONFIG_EFI, it won't work. (ia64 also supports it, but that's dead so is not included) - Do not build EFI support code in architectures on which the kernel does not support CONFIG_EFI, it won't work. (ia64 also supports it, but that's dead so is not included) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=671
2014-06-12 11:30:28 +02:00
%if 0%{has_efi}
%{_bindir}/bootctl
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%{_prefix}/lib/systemd/system-generators/systemd-efi-boot-generator
- Do not build EFI support code in architectures on which the kernel does not support CONFIG_EFI, it won't work. (ia64 also supports it, but that's dead so is not included) - Do not build EFI support code in architectures on which the kernel does not support CONFIG_EFI, it won't work. (ia64 also supports it, but that's dead so is not included) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=671
2014-06-12 11:30:28 +02:00
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_prefix}/lib/systemd/system-generators/systemd-getty-generator
%{_prefix}/lib/systemd/system-generators/systemd-rc-local-generator
%{_prefix}/lib/systemd/system-generators/systemd-fstab-generator
%{_prefix}/lib/systemd/system-generators/systemd-system-update-generator
- Replace parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch patch with insserv-generator.patch: no longer patch systemd main binary but generate systemd drop-in files using a generator, for insserv.conf compatibility. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=410
2013-07-02 22:42:56 +02:00
%{_prefix}/lib/systemd/system-generators/systemd-insserv-generator
- version 207, distribution specific changes follow, for overall release notes see NEWS. - Fixed: * Failed at step PAM spawning /usr/lib/systemd/systemd: Operation not permitted * Fix shutdown hang "a stop job is running for Session 1 of user root" that was reported in opensuse-factory list. - systemd-sysctl no longer reads /etc/sysctl.conf however backward compatbility is to be provides by a symlink created at %post. - version 207, distribution specific changes follow, for overall release notes see NEWS. - Fixed: * Failed at step PAM spawning /usr/lib/systemd/systemd: Operation not permitted * Fix shutdown hang "a stop job is running for Session 1 of user root" that was reported in opensuse-factory list. - systemd-sysctl no longer reads /etc/sysctl.conf however backward compatbility is to be provides by a symlink created at %post. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=429
2013-09-13 09:25:15 +02:00
%{_prefix}/lib/systemd/system-generators/systemd-gpt-auto-generator
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
/%{_lib}/security/pam_systemd.so
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=723
2014-07-21 15:37:02 +02:00
%config /etc/pam.d/systemd-user
new snapshot OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=134
2011-04-26 20:17:18 +02:00
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%dir %{_libexecdir}/modules-load.d
use modules-load.d OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=67
2010-10-03 18:01:13 +02:00
%dir %{_sysconfdir}/modules-load.d
- Rename remaning udev patches (clean-up). - Generate %{_libexecdir}/modules-load.d/sg.conf so we load sg module at boot time not from udev (bnc#761109). - Drop unused patches: 1001-Reinstate-TIMEOUT-handling.patch 1005-udev-fix-sg-autoload-regression.patch 1026-re-add-persistent-net.patch - Rename remaning udev patches (clean-up). - Generate %{_libexecdir}/modules-load.d/sg.conf so we load sg module at boot time not from udev (bnc#761109). - Drop unused patches: 1001-Reinstate-TIMEOUT-handling.patch 1005-udev-fix-sg-autoload-regression.patch 1026-re-add-persistent-net.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=371
2013-04-25 10:33:19 +02:00
%{_libexecdir}/modules-load.d/sg.conf
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%dir %{_libexecdir}/tmpfiles.d
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=66
2010-10-03 15:25:05 +02:00
%dir %{_sysconfdir}/tmpfiles.d
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_libexecdir}/tmpfiles.d/*.conf
%dir %{_libexecdir}/binfmt.d
new snapshot OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=134
2011-04-26 20:17:18 +02:00
%dir %{_sysconfdir}/binfmt.d
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%dir %{_libexecdir}/sysctl.d
new snapshot OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=134
2011-04-26 20:17:18 +02:00
%dir %{_sysconfdir}/sysctl.d
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%dir %{_sysconfdir}/systemd
%dir %{_sysconfdir}/systemd/system
%dir %{_sysconfdir}/systemd/user
%dir %{_sysconfdir}/xdg/systemd
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=562
2014-03-14 12:36:31 +01:00
%dir %{_sysconfdir}/dbus-1
%dir %{_sysconfdir}/dbus-1/system.d
- fix build with rpm-4.11.1 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=414
2013-07-12 17:10:22 +02:00
%{_sysconfdir}/xdg/systemd/user
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=562
2014-03-14 12:36:31 +01:00
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%config(noreplace) %{_sysconfdir}/systemd/bootchart.conf
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%config(noreplace) %{_sysconfdir}/systemd/system.conf
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%config(noreplace) %{_sysconfdir}/systemd/logind.conf
%config(noreplace) %{_sysconfdir}/systemd/journald.conf
Update to v30 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=160
2011-07-18 18:25:41 +02:00
%config(noreplace) %{_sysconfdir}/systemd/user.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
- Update to release 205: + two new unit types have been introduced: - Scope units are very similar to service units, however, are created out of pre-existing processes -- instead of PID 1 forking off the processes. - Slice units may be used to partition system resources in an hierarchial fashion and then assign other units to them. By default there are now three slices: system.slice (for all system services), user.slice (for all user sessions), machine.slice (for VMs and containers). + new concept of "transient" units, which are created at runtime using an API and not based on configuration from disk. + logind has been updated to make use of scope and slice units to manage user sessions. Logind will no longer create cgroups hierchies itself but will relying on PID 1. + A new mini-daemon "systemd-machined" has been added which may be used by virtualization managers to register local VMs/containers. machinectl tool has been added to query meta-data from systemd-machined. + Low-level cgroup configuration options ControlGroup=, ControlGroupModify=, ControlGroupPersistent=, ControlGroupAttribute= have been removed. High-level attribute settings or slice units should be used instead? + A new bus call SetUnitProperties() has been added to alter various runtime parameters of a unit, including cgroup parameters. systemctl gained set-properties command to wrap this call. + A new tool "systemd-run" has been added which can be used to run arbitrary command lines as transient services or scopes, while configuring a number of settings via the command OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=412
2013-07-04 17:28:49 +02:00
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
version 25 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=133
2011-04-22 19:35:38 +02:00
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
Update to v30 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=160
2011-07-18 18:25:41 +02:00
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=672
2014-06-12 12:21:33 +02:00
# Some files which may created by us
%dir %{_sysconfdir}/X11/xorg.conf.d
%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
%ghost %config(noreplace) %{_sysconfdir}/locale.conf
%ghost %config(noreplace) %{_sysconfdir}/machine-id
%ghost %config(noreplace) %{_sysconfdir}/machine-info
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel2.target
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel3.target
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
Update to v30 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=160
2011-07-18 18:25:41 +02:00
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
version 25 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=133
2011-04-22 19:35:38 +02:00
%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
- Update to release 205: + two new unit types have been introduced: - Scope units are very similar to service units, however, are created out of pre-existing processes -- instead of PID 1 forking off the processes. - Slice units may be used to partition system resources in an hierarchial fashion and then assign other units to them. By default there are now three slices: system.slice (for all system services), user.slice (for all user sessions), machine.slice (for VMs and containers). + new concept of "transient" units, which are created at runtime using an API and not based on configuration from disk. + logind has been updated to make use of scope and slice units to manage user sessions. Logind will no longer create cgroups hierchies itself but will relying on PID 1. + A new mini-daemon "systemd-machined" has been added which may be used by virtualization managers to register local VMs/containers. machinectl tool has been added to query meta-data from systemd-machined. + Low-level cgroup configuration options ControlGroup=, ControlGroupModify=, ControlGroupPersistent=, ControlGroupAttribute= have been removed. High-level attribute settings or slice units should be used instead? + A new bus call SetUnitProperties() has been added to alter various runtime parameters of a unit, including cgroup parameters. systemctl gained set-properties command to wrap this call. + A new tool "systemd-run" has been added which can be used to run arbitrary command lines as transient services or scopes, while configuring a number of settings via the command OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=412
2013-07-04 17:28:49 +02:00
%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
Update to v30 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=160
2011-07-18 18:25:41 +02:00
%{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
Updating link to change in openSUSE:Factory/systemd revision 6 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=9be1d29ab21fddfc9a76a51ef58ec696
2010-09-27 00:49:25 +02:00
%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%if ! 0%{?bootstrap}
- Move systemd-journal-gateway to subpackage to lower dependencies in default install. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=417
2013-07-25 17:40:51 +02:00
%exclude %{_datadir}/systemd/gatewayd
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%endif
- Update to release 37: - many bugfixes - ConditionCapability added, useful for containers. - locale mechanism got extend to kbd configuration for both X and the console - don't try to guess PID for SysV services anymore (bnc#723194) - Drop detect-non-running.patch, logind-warning.patch. - Rewrite systemd-sysv-convert in bash (bnc#716939) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=214
2011-10-12 12:44:11 +02:00
%{_datadir}/systemd
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if ! 0%{?bootstrap}
Updating link to change in openSUSE:Factory/systemd revision 6 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=9be1d29ab21fddfc9a76a51ef58ec696
2010-09-27 00:49:25 +02:00
# Packaged in sysvinit subpackage
%exclude %{_mandir}/man1/init.1*
%exclude %{_mandir}/man8/halt.8*
%exclude %{_mandir}/man8/reboot.8*
%exclude %{_mandir}/man8/shutdown.8*
%exclude %{_mandir}/man8/poweroff.8*
%exclude %{_mandir}/man8/telinit.8*
%exclude %{_mandir}/man8/runlevel.8*
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%exclude %{_mandir}/man*/*udev*.[0-9]*
- Move systemd-journal-gateway to subpackage to lower dependencies in default install. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=417
2013-07-25 17:40:51 +02:00
%exclude %{_mandir}/man8/systemd-journal-gatewayd.*
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%{_mandir}/man1/*.1*
%{_mandir}/man5/*.5*
%{_mandir}/man7/*.7*
%{_mandir}/man8/*.8*
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%{_docdir}/systemd
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_prefix}/lib/udev/rules.d/70-uaccess.rules
%{_prefix}/lib/udev/rules.d/71-seat.rules
%{_prefix}/lib/udev/rules.d/73-seat-late.rules
%if ! 0%{?bootstrap}
%{_prefix}/lib/udev/rules.d/73-seat-numlock.rules
%endif
%{_prefix}/lib/udev/rules.d/99-systemd.rules
%{_prefix}/lib/udev/numlock-on
Reduce build time dependencies OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=398
2013-06-19 09:04:23 +02:00
%if 0%{suse_version} < 1310
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_sysconfdir}/rpm/macros.systemd
Reduce build time dependencies OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=398
2013-06-19 09:04:23 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%dir %{_localstatedir}/lib/systemd
%dir %{_localstatedir}/lib/systemd/sysv-convert
%dir %{_localstatedir}/lib/systemd/migrated
%dir %{_localstatedir}/lib/systemd/catalog
%ghost %{_localstatedir}/lib/systemd/catalog/database
%dir %{_localstatedir}/lib/systemd/coredump
%dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/*
%ghost %{_localstatedir}/lib/systemd/backlight
%ghost %{_localstatedir}/lib/systemd/random-seed
- fix file list of systemd.pc - fix file list of systemd.pc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=641
2014-05-21 21:24:38 +02:00
%if 0%{?suse_version} > 1310
%{_datadir}/pkgconfig/systemd.pc
%endif
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
- don't build bash-completions for bootstrap package - don't build bash-completions for bootstrap package OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=515
2014-02-11 11:54:05 +01:00
%if ! 0%{?bootstrap}
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=531
2014-03-03 15:58:29 +01:00
%files bash-completion -f files.completion
- split bash-completion support into its own package, no need for sles_version OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=509
2014-02-08 11:46:51 +01:00
%defattr(-,root,root,-)
%dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/*
- don't build bash-completions for bootstrap package - don't build bash-completions for bootstrap package OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=515
2014-02-11 11:54:05 +01:00
%endif
- split bash-completion support into its own package, no need for sles_version OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=509
2014-02-08 11:46:51 +01:00
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
%files devel
%defattr(-,root,root,-)
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%{_libdir}/libsystemd.so
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
%{_libdir}/libsystemd-daemon.so
%{_libdir}/libsystemd-login.so
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
%{_libdir}/libsystemd-id128.so
%{_libdir}/libsystemd-journal.so
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
%dir %{_includedir}/systemd
%{_includedir}/systemd/sd-login.h
%{_includedir}/systemd/sd-daemon.h
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
%{_includedir}/systemd/sd-id128.h
%{_includedir}/systemd/sd-journal.h
%{_includedir}/systemd/sd-messages.h
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%{_includedir}/systemd/_sd-common.h
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=638
2014-05-21 10:58:28 +02:00
%if 0%{?suse_version} <= 1310
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
%{_datadir}/pkgconfig/systemd.pc
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=638
2014-05-21 10:58:28 +02:00
%endif
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%{_libdir}/pkgconfig/libsystemd.pc
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
%{_libdir}/pkgconfig/libsystemd-daemon.pc
%{_libdir}/pkgconfig/libsystemd-login.pc
Package needs OK from fcrozat. Update to the latest systemd-38 version. Additional listen.conf so that rsyslog keeps working. Also added xz as an explicit buildrequires to ensure that the tarball can be unpacked. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=232
2012-01-18 17:44:20 +01:00
%{_libdir}/pkgconfig/libsystemd-id128.pc
%{_libdir}/pkgconfig/libsystemd-journal.pc
- man pages from section 3 are developer docs, move them to the -devel package. - man pages from section 3 are developer docs, move them to the -devel package. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=753
2014-08-22 14:45:12 +02:00
%if ! 0%{?bootstrap}
%{_mandir}/man3/*.3*
%endif
Adjust rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166
2011-08-01 16:36:43 +02:00
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%files sysvinit
%defattr(-,root,root,-)
/sbin/init
/sbin/reboot
/sbin/halt
/sbin/shutdown
/sbin/poweroff
/sbin/telinit
/sbin/runlevel
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%if ! 0%{?bootstrap}
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%{_mandir}/man1/init.1*
%{_mandir}/man8/halt.8*
%{_mandir}/man8/reboot.8*
%{_mandir}/man8/shutdown.8*
%{_mandir}/man8/poweroff.8*
%{_mandir}/man8/telinit.8*
%{_mandir}/man8/runlevel.8*
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%files -n %{udevpkgname}
%defattr(-,root,root)
/sbin/udevd
/sbin/udevadm
# keep for compatibility
%ghost /lib/udev
%{_bindir}/udevadm
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
%if 0%{?suse_version} <= 1310
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_prefix}/lib/firmware
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=658
2014-06-05 10:47:12 +02:00
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%dir %{_prefix}/lib/udev/
%{_prefix}/lib/udev/accelerometer
%{_prefix}/lib/udev/ata_id
%{_prefix}/lib/udev/cdrom_id
%{_prefix}/lib/udev/collect
%{_prefix}/lib/udev/mtd_probe
%{_prefix}/lib/udev/scsi_id
%{_prefix}/lib/udev/v4l_id
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=729
2014-07-24 12:08:27 +02:00
%{_prefix}/lib/udev/udev-generate-persistent-rule
- Re-add persistent rules to have a backup option if predictable rules are disabled at boot time with 'net.ifnames=0' option. add: 1021-udev-re-add-persistent-net-rules.patch - udev: remove seqnum API and all assumptions about seqnums add: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - Re-add persistent rules to have a backup option if predictable rules are disabled at boot time with 'net.ifnames=0' option. add: 1021-udev-re-add-persistent-net-rules.patch - udev: remove seqnum API and all assumptions about seqnums add: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=649
2014-05-30 13:13:04 +02:00
%{_prefix}/lib/udev/net-set-sriov-names
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=715
2014-07-14 17:05:04 +02:00
%{_prefix}/lib/udev/remount-tmpfs
- Re-add persistent rules to have a backup option if predictable rules are disabled at boot time with 'net.ifnames=0' option. add: 1021-udev-re-add-persistent-net-rules.patch - udev: remove seqnum API and all assumptions about seqnums add: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - Re-add persistent rules to have a backup option if predictable rules are disabled at boot time with 'net.ifnames=0' option. add: 1021-udev-re-add-persistent-net-rules.patch - udev: remove seqnum API and all assumptions about seqnums add: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=649
2014-05-30 13:13:04 +02:00
%{_prefix}/lib/udev/rule_generator.functions
%{_prefix}/lib/udev/write_net_rules
- New root symlink rule generator Add 1096-new-udev-root-symlink-generator.patch - Remove write_dev_root_rule and systemd-udev-root-symlink - New root symlink rule generator Add 1096-new-udev-root-symlink-generator.patch - Remove write_dev_root_rule and systemd-udev-root-symlink OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=816
2014-11-14 13:19:40 +01:00
%{_prefix}/lib/udev/rootsymlink-generator
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%dir %{_prefix}/lib/udev/rules.d/
%exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules
%exclude %{_prefix}/lib/udev/rules.d/71-seat.rules
%exclude %{_prefix}/lib/udev/rules.d/73-seat-late.rules
%exclude %{_prefix}/lib/udev/rules.d/73-seat-numlock.rules
%exclude %{_prefix}/lib/udev/rules.d/99-systemd.rules
%{_prefix}/lib/udev/rules.d/*.rules
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%dir %{_prefix}/lib/udev/hwdb.d
%{_prefix}/lib/udev/hwdb.d/*
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_sysconfdir}/init.d/boot.udev
%dir %{_sysconfdir}/udev/
%dir %{_sysconfdir}/udev/rules.d/
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%ghost %{_sysconfdir}/udev/hwdb.bin
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%config(noreplace) %{_sysconfdir}/udev/udev.conf
%if ! 0%{?bootstrap}
%{_mandir}/man?/*udev*.[0-9]*
%endif
%dir %{_prefix}/lib/systemd/system
%{_prefix}/lib/systemd/systemd-udevd
%{_prefix}/lib/systemd/system/*udev*.service
%{_prefix}/lib/systemd/system/systemd-udevd*.socket
%dir %{_prefix}/lib/systemd/system/sysinit.target.wants
%{_prefix}/lib/systemd/system/sysinit.target.wants/systemd-udev*.service
%dir %{_prefix}/lib/systemd/system/sockets.target.wants
%{_prefix}/lib/systemd/system/sockets.target.wants/systemd-udev*.socket
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=524
2014-02-28 18:10:52 +01:00
%dir %{_prefix}/lib/systemd/network
%{_prefix}/lib/systemd/network/*.link
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%{_prefix}/lib/systemd/network/*.network
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=638
2014-05-21 10:58:28 +02:00
%if 0%{?suse_version} > 1310
%{_datadir}/pkgconfig/udev.pc
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%files -n lib%{udevpkgname}%{udev_major}
%defattr(-,root,root)
%{_libdir}/libudev.so.*
%files -n lib%{udevpkgname}-devel
%defattr(-,root,root)
%{_includedir}/libudev.h
%{_libdir}/libudev.so
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=638
2014-05-21 10:58:28 +02:00
%if 0%{?suse_version} <= 1310
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_datadir}/pkgconfig/udev.pc
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=638
2014-05-21 10:58:28 +02:00
%endif
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%{_libdir}/pkgconfig/libudev.pc
%if ! 0%{?bootstrap}
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%dir %{_datadir}/gtk-doc/html/libudev
%{_datadir}/gtk-doc/html/libudev/*
%endif
%if ! 0%{?bootstrap}
%files -n libgudev-1_0-0
%defattr(-,root,root)
%{_libdir}/libgudev-1.0.so.*
%files -n typelib-1_0-GUdev-1_0
%defattr(-,root,root)
%{_libdir}/girepository-1.0/GUdev-1.0.typelib
%files -n libgudev-1_0-devel
%defattr(-,root,root)
%dir %{_includedir}/gudev-1.0
%dir %{_includedir}/gudev-1.0/gudev
%{_includedir}/gudev-1.0/gudev/*.h
%{_libdir}/libgudev-1.0.so
%{_libdir}/pkgconfig/gudev-1.0.pc
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%dir %{_datadir}/gtk-doc/html/gudev
%{_datadir}/gtk-doc/html/gudev/*
%{_datadir}/gir-1.0/GUdev-1.0.gir
- adding a package systemd-logger that blocks syslog implementations from installation to make an installation that only uses the journal - adding a package systemd-logger that blocks syslog implementations from installation to make an installation that only uses the journal OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=309
2012-11-06 15:52:17 +01:00
%files logger
%defattr(-,root,root)
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=736
2014-07-28 12:21:09 +02:00
%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/
. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
2014-03-03 15:25:26 +01:00
%{_localstatedir}/log/README
- links more manpages for migrated tools (from Christopher Yeleighton). - disable boot.localnet service, ypbind service will do the right thing now (bnc#716746) - add xdm-display-manager.patch: pull xdm.service instead of display-manager.service (needed until xdm initscript is migrated to native systemd service). - Add fix-permissions-btmp.patch: ensure btmp is owned only by root (bnc#777405). - Have the udev package create a tape group, as referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules (DimStar). - Add fix-bad-memory-access.patch: fix crash in journal rotation. - Add fix-dbus-crash.patch: fix D-Bus caused crash. - Add sync-on-shutdown.patch: ensure sync is done when initiating shutdown. - Add mount-efivars.patch: mount efivars if booting on UEFI. - Ship a empty systemd-journald initscript in systemd-logger to stop insserv to complain about missing syslog dependency. - Update 0001-service-Fix-dependencies-added-when-parsing-insserv..patch with bug fixes from Debian. old: Base:System/systemd new: home:fcrozat:branches:Base:System/systemd rev NoneIndex: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch =================================================================== --- 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 311) +++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch (revision 5) @@ -1,17 +1,35 @@ -From 6620bceb7233a830be3635a4f7a7dc75c13a9c8e Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat@suse.com> -Date: Fri, 30 Sep 2011 14:12:45 +0200 -Subject: [PATCH] service: Fix dependencies added when parsing insserv.conf - ---- - src/service.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -Index: systemd-41/src/service.c +Index: systemd-195/src/core/service.c =================================================================== ---- systemd-41.orig/src/core/service.c -+++ systemd-41/src/core/service.c -@@ -3210,23 +3210,30 @@ static void sysv_facility_in_insserv_con +--- systemd-195.orig/src/core/service.c ++++ systemd-195/src/core/service.c +@@ -3391,12 +3391,13 @@ static void service_notify_message(Unit + + #ifdef HAVE_SYSV_COMPAT + +-#ifdef TARGET_SUSE +-static void sysv_facility_in_insserv_conf(Manager *mgr) { +- FILE *f=NULL; ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) ++static void sysv_parse_insserv_conf(Manager *mgr, const char* filename) { ++ FILE *f = NULL; + int r; + +- if (!(f = fopen("/etc/insserv.conf", "re"))) { ++ if (!(f = fopen(filename, "re"))) { ++ log_error("Failed to open file %s", filename); + r = errno == ENOENT ? 0 : -errno; + goto finish; + } +@@ -3410,7 +3411,7 @@ static void sysv_facility_in_insserv_con + break; + + r = -errno; +- log_error("Failed to read configuration file '/etc/insserv.conf': %s", strerror(-r)); ++ log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); + goto finish; + } + +@@ -3425,23 +3426,30 @@ static void sysv_facility_in_insserv_con Unit *u; if (sysv_translate_facility(parsed[0], NULL, &facility) < 0) continue; @@ -29,12 +47,12 @@ STRV_FOREACH (j, parsed+1) { - if (*j[0]=='+') { - e = UNIT_WANTS; -+ if (*j[0]=='+') ++ if (*j[0] == '+') name = *j+1; - } - else { - e = UNIT_REQUIRES; -+ else ++ else name = *j; - } + if (streq(name, "boot.localfs") || @@ -44,9 +62,54 @@ continue; - r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, e, dep, NULL, true); -+ r = unit_add_dependency_by_name_inverse(u, UNIT_BEFORE, dep, NULL, true); -+ if (*j[0]!='+') ++ r = unit_add_two_dependencies_by_name_inverse(u, UNIT_WANTS, UNIT_BEFORE, dep, NULL, true); ++ if (*j[0] != '+') + r = unit_add_dependency_by_name(u, UNIT_REQUIRES, dep, NULL, true); free(dep); } } +@@ -3454,6 +3462,35 @@ finish: + fclose(f); + + } ++ ++static void sysv_facility_in_insserv_conf(Manager *mgr) { ++ DIR *d =NULL; ++ struct dirent *de; ++ ++#ifdef TARGET_DEBIAN ++ if (!(d = opendir("/etc/insserv.conf.d/"))) ++ if (errno != ENOENT) { ++ log_warning("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); ++ goto finish; ++ } ++ ++ while ((de = readdir(d))) { ++ char *path = NULL; ++ if (ignore_file(de->d_name)) ++ continue; ++ ++ path = join("/etc/insserv.conf.d/", de->d_name, NULL); ++ sysv_parse_insserv_conf(mgr, path); ++ free(path); ++ } ++finish: ++ if (d) ++ closedir(d); ++#endif ++ ++ sysv_parse_insserv_conf(mgr, "/etc/insserv.conf"); ++} ++ + #endif + + static int service_enumerate(Manager *m) { +@@ -3604,7 +3641,7 @@ static int service_enumerate(Manager *m) + + r = 0; + +-#ifdef TARGET_SUSE ++#if defined(TARGET_SUSE) || defined(TARGET_DEBIAN) + sysv_facility_in_insserv_conf (m); + #endif + Index: systemd-mini.changes =================================================================== --- systemd-mini.changes (revision 311) +++ systemd-mini.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd-mini.spec =================================================================== --- systemd-mini.spec (revision 311) +++ systemd-mini.spec (revision 5) @@ -102,6 +102,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -128,6 +129,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -137,6 +140,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -151,8 +162,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -313,6 +322,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -337,6 +347,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -368,8 +384,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -378,11 +400,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -392,7 +409,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -415,8 +432,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -442,8 +458,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -532,6 +552,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -724,6 +746,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -787,7 +813,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -878,6 +908,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: systemd.changes =================================================================== --- systemd.changes (revision 311) +++ systemd.changes (revision 5) @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com + +- links more manpages for migrated tools (from Christopher + Yeleighton). +- disable boot.localnet service, ypbind service will do the right + thing now (bnc#716746) +- add xdm-display-manager.patch: pull xdm.service instead of + display-manager.service (needed until xdm initscript is migrated + to native systemd service). +- Add fix-permissions-btmp.patch: ensure btmp is owned only by root + (bnc#777405). +- Have the udev package create a tape group, as referenced by + 50-udev-default.rules and 60-persistent-storage-tape.rules + (DimStar). +- Add fix-bad-memory-access.patch: fix crash in journal rotation. +- Add fix-dbus-crash.patch: fix D-Bus caused crash. +- Add sync-on-shutdown.patch: ensure sync is done when initiating + shutdown. +- Add mount-efivars.patch: mount efivars if booting on UEFI. + + +------------------------------------------------------------------- +Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com + +- Ship a empty systemd-journald initscript in systemd-logger to + stop insserv to complain about missing syslog dependency. +- Update + 0001-service-Fix-dependencies-added-when-parsing-insserv..patch + with bug fixes from Debian. + +------------------------------------------------------------------- Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - /var/log/journal is now only provided by systemd-logger (journal Index: systemd.spec =================================================================== --- systemd.spec (revision 311) +++ systemd.spec (revision 5) @@ -97,6 +97,7 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: libgcrypt.m4 +Source8: systemd-journald.init Source1060: boot.udev Source1061: write_dev_root_rule @@ -123,6 +124,8 @@ Patch56: support-suse-clock-sysconfig.patch Patch59: fix-enable-disable-boot-initscript.patch Patch60: var-run-lock.patch +Patch63: xdm-display-manager.patch +Patch64: fix-permissions-btmp.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -132,6 +135,14 @@ Patch61: fix-logind-pty-seat.patch # PATCH-FIX-UPSTREAM fix-build-glibc217.patch fcrozat@suse.com -- fix build with latest glibc Patch62: fix-build-glibc217.patch +# PATCH-FIX-UPSTREAM fix-bad-memory-access.patch fcrozat@suse.com -- fix bad memory access +Patch65: fix-bad-memory-access.patch +# PATCH-FIX-UPSTREAM fix-dbus-crash.patch fcrozat@suse.com -- fix D-Bus caused crash +Patch66: fix-dbus-crash.patch +# PATCH-FIX-UPSTREAM sync-on-shutdown.patch fcrozat@suse.com -- Sync on shutdown +Patch67: sync-on-shutdown.patch +# PATCH-FIX-UPSTREAM mount-efivars.patch fcrozat@suse.com -- mount efivars if booting under UEFI +Patch68: mount-efivars.patch # udev patches # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch @@ -146,8 +157,6 @@ # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch1027: 0027-udev-fix-sg-autoload-regression.patch -# systemd patches - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -308,6 +317,7 @@ %patch1026 -p1 %patch1027 -p1 +#systemd %patch1 -p1 %patch6 -p1 # don't apply when bootstrapping to not modify configure.in @@ -332,6 +342,12 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build autoreconf -fiv @@ -363,8 +379,14 @@ ln -sf %{_bindir}/systemd-ask-password $RPM_BUILD_ROOT/bin/systemd-ask-password ln -sf %{_bindir}/systemctl $RPM_BUILD_ROOT/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd $RPM_BUILD_ROOT/sbin/udevd +%if ! 0%{?bootstrap} +ln -sf systemd-udevd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/udevd.8 +%endif mkdir -p $RPM_BUILD_ROOT/%{_prefix}/usr/lib/firmware/updates ln -sf /lib/firmware $RPM_BUILD_ROOT/usr/lib/firmware +%if ! 0%{?bootstrap} +install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald +%endif install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service @@ -373,11 +395,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -#fix manpages -%if ! 0%{?bootstrap} -sed -i -e 's,^\(\.so \)\(.*\.\)\([0-9]\),\1man\3/\2\3,g' %{buildroot}/%{_mandir}/*/* -%endif - #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -387,7 +404,7 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future -#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators +#install -m755 %{S:5} %{buildroot}/usr/lib/systemd/system-generators ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot @@ -410,8 +427,7 @@ ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/ldconfig.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/loadmodules.service install -m644 %{S:2} %{buildroot}/%{_prefix}/lib/systemd/system/localfs.service -# need to be implemented in systemd directly -#ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/localnet.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/proc.service ln -s systemd-fsck-root.service %{buildroot}/%{_prefix}/lib/systemd/system/rootfsck.service ln -s /dev/null %{buildroot}/%{_prefix}/lib/systemd/system/single.service @@ -437,8 +453,12 @@ %endif # legacy links -ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl -ln -s journalctl %{buildroot}%{_bindir}/systemd-journalctl +for f in loginctl journalctl ; do + ln -s $f %{buildroot}%{_bindir}/systemd-$f +%if ! 0%{?bootstrap} + ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1 +%endif +done ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one @@ -527,6 +547,8 @@ elif [ ! -e /lib/udev ]; then ln -s /usr/lib/udev /lib/udev fi +# Create "tape" group which is referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules +/usr/sbin/groupadd -r tape 2> /dev/null || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root ; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -719,6 +741,10 @@ %exclude %{_mandir}/man8/telinit.8* %exclude %{_mandir}/man8/runlevel.8* %exclude %{_mandir}/man*/*udev*.[0-9]* + +# Packaged in analyze subpackage +%exclude %{_mandir}/man1/systemd-analyze.1* + %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -782,7 +808,11 @@ %endif %files analyze +%defattr(-,root,root) %attr(0755,root,root) /usr/bin/systemd-analyze +%if ! 0%{?bootstrap} +%{_mandir}/man1/systemd-analyze.1* +%endif %files -n %{udevpkgname} %defattr(-,root,root) @@ -873,6 +903,7 @@ %defattr(-,root,root) %dir /var/log/journal /var/log/README +/etc/init.d/systemd-journald %endif Index: fix-bad-memory-access.patch =================================================================== --- fix-bad-memory-access.patch (added) +++ fix-bad-memory-access.patch (revision 5) @@ -0,0 +1,23 @@ +From 7d73c1343be02a59b17de0cd34375deeb815d89c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 20 Nov 2012 00:19:27 +0100 +Subject: [PATCH] journald: fix bad memory access + +https://bugzilla.redhat.com/show_bug.cgi?id=875653 +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: systemd-195/src/journal/journald.c +=================================================================== +--- systemd-195.orig/src/journal/journald.c ++++ systemd-195/src/journal/journald.c +@@ -342,7 +342,7 @@ static void server_rotate(Server *s) { + HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { + r = journal_file_rotate(&f, s->compress, s->seal); + if (r < 0) +- if (f->path) ++ if (f) + log_error("Failed to rotate %s: %s", f->path, strerror(-r)); + else + log_error("Failed to create user journal: %s", strerror(-r)); Index: fix-dbus-crash.patch =================================================================== --- fix-dbus-crash.patch (added) +++ fix-dbus-crash.patch (revision 5) @@ -0,0 +1,32 @@ +From 645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Wed, 31 Oct 2012 11:53:56 +0100 +Subject: [PATCH] dbus-manager: fix a fatal dbus abort in + bus_manager_message_handler() + +If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref() +will be called twice on "reply", causing systemd to crash. So remove +the call to dbus_message_unref(); it is unnecessary because of +the cleanup attribute on "reply". + +[zj: modified to leave one dbus_message_unref() alone, per Colin +Walters' comment.] +--- + src/core/dbus-manager.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index 2010241..3cf3e90 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -1436,7 +1436,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h); + if (r < 0) { + unit_file_list_free(h); +- dbus_message_unref(reply); + return bus_send_error_reply(connection, message, NULL, r); + } + +-- +1.7.10.4 + Index: fix-permissions-btmp.patch =================================================================== --- fix-permissions-btmp.patch (added) +++ fix-permissions-btmp.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-44/tmpfiles.d/systemd.conf +=================================================================== +--- systemd-44.orig/tmpfiles.d/systemd.conf ++++ systemd-44/tmpfiles.d/systemd.conf +@@ -11,7 +11,7 @@ d /run/user 0755 root root 10d + F /run/utmp 0664 root utmp - + + f /var/log/wtmp 0664 root utmp - +-f /var/log/btmp 0600 root utmp - ++f /var/log/btmp 0600 root root - + + d /var/cache/man - - - 30d + Index: mount-efivars.patch =================================================================== --- mount-efivars.patch (added) +++ mount-efivars.patch (revision 5) @@ -0,0 +1,336 @@ +From f271dd97622b656c1c013d181ea615c671cc2438 Mon Sep 17 00:00:00 2001 +From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> +Date: Sat, 27 Oct 2012 11:23:22 +0800 +Subject: [PATCH] systemd: mount the EFI variable filesystem +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add efivarfs to the mount_table in mount-setup.c, so the EFI variable +filesystem will be mounted when systemd executed. + +The EFI variable filesystem will merge in v3.7 or v3.8 linux kernel. + +Cc: Kay Sievers <kay@vrfy.org> +Cc: Lennart Poettering <lennart@poettering.net> +Cc: Mantas Mikulėnas <grawity@gmail.com> +Cc: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> +Cc: Matt Fleming <matt.fleming@intel.com> +Cc: Jeremy Kerr <jeremy.kerr@canonical.com> +Cc: Matthew Garrett <mjg@redhat.com> +Signed-off-by: Lee, Chun-Yi <jlee@suse.com> +--- + src/core/kmod-setup.c | 7 ++++--- + src/core/mount-setup.c | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index cc2a2d9..ce8a8e7 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -31,9 +31,10 @@ + #include "kmod-setup.h" + + static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "unix", "/proc/net/unix" ++ "autofs4", "/sys/class/misc/autofs", ++ "ipv6", "/sys/module/ipv6", ++ "efivarfs", "/sys/firmware/efi/efivars", ++ "unix", "/proc/net/unix" + }; + + #pragma GCC diagnostic push +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 0fd112f..9894c7f 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -66,6 +66,7 @@ static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, + { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, + { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +-- +1.7.10.4 + +From c1e5704657315b436c0409e8172c1fcb76adccad Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:06:27 +0100 +Subject: [PATCH] shared: add is_efiboot() + +--- + src/shared/util.c | 4 ++++ + src/shared/util.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 2a8afae..9983695 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -77,6 +77,10 @@ char **saved_argv = NULL; + static volatile unsigned cached_columns = 0; + static volatile unsigned cached_lines = 0; + ++bool is_efiboot(void) { ++ return access("/sys/firmware/efi", F_OK) >= 0; ++} ++ + size_t page_size(void) { + static __thread size_t pgsz = 0; + long r; +diff --git a/src/shared/util.h b/src/shared/util.h +index e387b12..99972cc 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -90,6 +90,8 @@ union dirent_storage { + #define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m" + #define ANSI_HIGHLIGHT_OFF "\x1B[0m" + ++bool is_efiboot(void); ++ + usec_t now(clockid_t clock); + + dual_timestamp* dual_timestamp_get(dual_timestamp *ts); +-- +1.7.10.4 + +From 1022373284b7562431fb0a6dba45db8af089a0e3 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:54:19 +0100 +Subject: [PATCH] kmod-setup: add conditional module loading callback + +--- + src/core/kmod-setup.c | 32 ++++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index ce8a8e7..383a6b2 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -30,11 +30,17 @@ + + #include "kmod-setup.h" + +-static const char * const kmod_table[] = { +- "autofs4", "/sys/class/misc/autofs", +- "ipv6", "/sys/module/ipv6", +- "efivarfs", "/sys/firmware/efi/efivars", +- "unix", "/proc/net/unix" ++typedef struct Kmodule { ++ const char *name; ++ const char *directory; ++ bool (*condition_fn)(void); ++} KModule; ++ ++static const KModule kmod_table[] = { ++ { "autofs4", "/sys/class/misc/autofs", NULL } , ++ { "ipv6", "/sys/module/ipv6", NULL }, ++ { "efivarfs", "/sys/firmware/efi/efivars", NULL }, ++ { "unix", "/proc/net/unix", NULL } , + }; + + #pragma GCC diagnostic push +@@ -42,7 +48,8 @@ static const char * const kmod_table[] = { + static void systemd_kmod_log(void *data, int priority, const char *file, int line, + const char *fn, const char *format, va_list args) + { +- log_metav(priority, file, line, fn, format, args); ++ /* library logging is enabled at debug only */ ++ log_metav(LOG_DEBUG, file, line, fn, format, args); + } + #pragma GCC diagnostic pop + +@@ -53,13 +60,15 @@ int kmod_setup(void) { + int err; + + for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) { ++ if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn()) ++ continue; + +- if (access(kmod_table[i+1], F_OK) >= 0) ++ if (access(kmod_table[i].directory, F_OK) >= 0) + continue; + + log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. " + "We'll now try to work around this by loading the module...", +- kmod_table[i]); ++ kmod_table[i].name); + + if (!ctx) { + ctx = kmod_new(NULL, NULL); +@@ -69,13 +78,12 @@ int kmod_setup(void) { + } + + kmod_set_log_fn(ctx, systemd_kmod_log, NULL); +- + kmod_load_resources(ctx); + } + +- err = kmod_module_new_from_name(ctx, kmod_table[i], &mod); ++ err = kmod_module_new_from_name(ctx, kmod_table[i].name, &mod); + if (err < 0) { +- log_error("Failed to load module '%s'", kmod_table[i]); ++ log_error("Failed to lookup module '%s'", kmod_table[i].name); + continue; + } + +@@ -85,7 +93,7 @@ int kmod_setup(void) { + else if (err == KMOD_PROBE_APPLY_BLACKLIST) + log_info("Module '%s' is blacklisted", kmod_module_get_name(mod)); + else +- log_error("Failed to insert '%s'", kmod_module_get_name(mod)); ++ log_error("Failed to insert module '%s'", kmod_module_get_name(mod)); + + kmod_module_unref(mod); + } +-- +1.7.10.4 + +From 3dfb265083347cb5700dc38f7cc0f479f378e6e9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 16:55:23 +0100 +Subject: [PATCH] kmod-setup: mounting efivarfs, *after* we tried to mount it, + is pointless + +The mount() system call, which we issue before loading modules, will trigger +a modprobe by the kernel and block until it returns. Trying to load it again +later, will have exactly the same result as the first time. +--- + src/core/kmod-setup.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 383a6b2..20ab232 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -39,7 +39,6 @@ typedef struct Kmodule { + static const KModule kmod_table[] = { + { "autofs4", "/sys/class/misc/autofs", NULL } , + { "ipv6", "/sys/module/ipv6", NULL }, +- { "efivarfs", "/sys/firmware/efi/efivars", NULL }, + { "unix", "/proc/net/unix", NULL } , + }; + +-- +1.7.10.4 + +From 6aa220e019f9dffd96590b06b68f937985204109 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Sun, 4 Nov 2012 17:03:48 +0100 +Subject: [PATCH] mount-setup: try mounting 'efivarfs' only if the system + bootet with EFI + +--- + TODO | 3 --- + src/core/mount-setup.c | 50 ++++++++++++++++++++++++++++++++---------------- + 2 files changed, 34 insertions(+), 19 deletions(-) + +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 9894c7f..98614d0 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -46,14 +46,20 @@ + #define TTY_GID 5 + #endif + ++typedef enum MountMode { ++ MNT_NONE = 0, ++ MNT_FATAL = 1 << 0, ++ MNT_IN_CONTAINER = 1 << 1, ++} MountMode; ++ + typedef struct MountPoint { + const char *what; + const char *where; + const char *type; + const char *options; + unsigned long flags; +- bool fatal; +- bool in_container; ++ bool (*condition_fn)(void); ++ MountMode mode; + } MountPoint; + + /* The first three entries we might need before SELinux is up. The +@@ -62,16 +68,26 @@ typedef struct MountPoint { + #define N_EARLY_MOUNT 4 + + static const MountPoint mount_table[] = { +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true, true }, +- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true, true }, +- { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, +- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false, true }, +- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true, true }, +- { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, false, true }, +- { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, true }, ++ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_NONE }, ++ { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ is_efiboot, MNT_NONE }, ++ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, ++ NULL, MNT_IN_CONTAINER }, ++ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_FATAL|MNT_IN_CONTAINER }, ++ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, ++ NULL, MNT_IN_CONTAINER }, ++ { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ NULL, MNT_IN_CONTAINER }, + }; + + /* These are API file systems that might be mounted by other software, +@@ -119,6 +135,9 @@ static int mount_one(const MountPoint *p, bool relabel) { + + assert(p); + ++ if (p->condition_fn && !p->condition_fn()) ++ return 0; ++ + /* Relabel first, just in case */ + if (relabel) + label_fix(p->where, true, true); +@@ -131,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) { + return 0; + + /* Skip securityfs in a container */ +- if (!p->in_container && detect_container(NULL) > 0) ++ if (!(p->mode & MNT_IN_CONTAINER) && detect_container(NULL) > 0) + return 0; + + /* The access mode here doesn't really matter too much, since +@@ -149,8 +168,8 @@ static int mount_one(const MountPoint *p, bool relabel) { + p->type, + p->flags, + p->options) < 0) { +- log_full(p->fatal ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); +- return p->fatal ? -errno : 0; ++ log_full((p->mode & MNT_FATAL) ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno)); ++ return (p->mode & MNT_FATAL) ? -errno : 0; + } + + /* Relabel again, since we now mounted something fresh here */ +@@ -289,7 +308,6 @@ int mount_cgroup_controllers(char ***join_controllers) { + p.type = "cgroup"; + p.options = options; + p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV; +- p.fatal = false; + + r = mount_one(&p, true); + free(controller); +-- +1.7.10.4 + Index: sync-on-shutdown.patch =================================================================== --- sync-on-shutdown.patch (added) +++ sync-on-shutdown.patch (revision 5) @@ -0,0 +1,49 @@ +From 0049f05a8bb82c3e084bacc5945596761d706c55 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 16 Nov 2012 01:30:29 +0100 +Subject: [PATCH] shutdown: readd explicit sync() when shutting down + +As it turns out reboot() doesn't actually imply a file system sync, but +only a disk sync. Accordingly, readd explicit sync() invocations +immediately before we invoke reboot(). + +This is much less dramatic than it might sounds as we umount all +disks/read-only remount them anyway before going down. +--- + src/core/service.c | 1 + + src/core/shutdown.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/core/service.c b/src/core/service.c +index cf08485..df72aba 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2485,6 +2485,7 @@ static int service_start_limit_test(Service *s) { + + case SERVICE_START_LIMIT_REBOOT_IMMEDIATE: + log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id); ++ sync(); + reboot(RB_AUTOBOOT); + break; + +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index cc8c57b..b59aef1 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -273,6 +273,13 @@ int main(int argc, char *argv[]) { + } + } + ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. So let's do this here, but not ++ * needlessly slow down containers. */ ++ if (!in_container) ++ sync(); ++ + if (cmd == LINUX_REBOOT_CMD_KEXEC) { + + if (!in_container) { +-- +1.7.10.4 + Index: systemd-journald.init =================================================================== --- systemd-journald.init (added) +++ systemd-journald.init (revision 5) @@ -0,0 +1,33 @@ +#! /bin/sh +# +# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# /etc/init.d/systemd-journald +# +### BEGIN INIT INFO +# Provides: syslog +# Required-Start: $null +# Required-Stop: $null +# Default-Start: 2 3 5 +# Default-Stop: +# Short-Description: compat wrapper for journald +# Description: compat wrapper for journald +### END INIT INFO + +. /etc/rc.status + +rc_reset + +case "$1" in + start|stop|restart) + rc_failed 3 + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +rc_exit Index: xdm-display-manager.patch =================================================================== --- xdm-display-manager.patch (added) +++ xdm-display-manager.patch (revision 5) @@ -0,0 +1,13 @@ +Index: systemd-195/units/graphical.target +=================================================================== +--- systemd-195.orig/units/graphical.target ++++ systemd-195/units/graphical.target +@@ -11,7 +11,7 @@ Documentation=man:systemd.special(7) + Requires=multi-user.target + After=multi-user.target + Conflicts=rescue.target +-Wants=display-manager.service ++Wants=xdm.service + AllowIsolate=yes + + [Install] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=312
2012-11-20 13:10:12 +01:00
/etc/init.d/systemd-journald
- adding a package systemd-logger that blocks syslog implementations from installation to make an installation that only uses the journal - adding a package systemd-logger that blocks syslog implementations from installation to make an installation that only uses the journal OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=309
2012-11-06 15:52:17 +01:00
update to v201 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
2013-04-13 13:09:53 +02:00
%files -n nss-myhostname
%defattr(-, root, root)
%{_sbindir}/nss-myhostname-config
/%{_lib}/*nss_myhostname*
- Move systemd-journal-gateway to subpackage to lower dependencies in default install. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=417
2013-07-25 17:40:51 +02:00
%files journal-gateway
%defattr(-, root, root)
%{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
%{_prefix}/lib/systemd/systemd-journal-gatewayd
%{_mandir}/man8/systemd-journal-gatewayd.*
%{_datadir}/systemd/gatewayd
- Create and own more systemd drop-in directories. - Improve mini packages for bootstrapping. - do not mount /tmp as tmpfs by default. - Fix install script when there is no inittab - Create a systemd-mini specfile to prevent cycle in bootstrapping OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=300
2012-10-26 14:34:44 +02:00
%endif
Accepting request 43879 from Base:System Copy from Base:System/systemd based on submit request 43879 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/43879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=1
2010-07-30 13:59:59 +02:00
%changelog
Reference in New Issue Copy Permalink