forked from pool/systemd
.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=660
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
b496dc68e4
commit
5982012590
37
0001-sd-event-restore-correct-timeout-behaviour.patch
Normal file
37
0001-sd-event-restore-correct-timeout-behaviour.patch
Normal file
@ -0,0 +1,37 @@
|
||||
Based on eec6022cf039e62233139000b9e95db943959e48 Mon Sep 17 00:00:00 2001
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Thu, 5 Jun 2014 13:43:30 +0200
|
||||
Subject: [PATCH] sd-event: restore correct timeout behaviour
|
||||
|
||||
---
|
||||
src/libsystemd/sd-event/sd-event.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
--- src/libsystemd/sd-event/sd-event.c
|
||||
+++ src/libsystemd/sd-event/sd-event.c 2014-06-06 10:26:51.422235695 +0000
|
||||
@@ -2047,6 +2047,7 @@ _public_ int sd_event_run(sd_event *e, u
|
||||
unsigned ev_queue_max;
|
||||
sd_event_source *p;
|
||||
int r, i, m;
|
||||
+ bool timedout;
|
||||
|
||||
assert_return(e, -EINVAL);
|
||||
assert_return(!event_pid_changed(e), -ECHILD);
|
||||
@@ -2084,6 +2085,8 @@ _public_ int sd_event_run(sd_event *e, u
|
||||
goto finish;
|
||||
}
|
||||
|
||||
+ timedout = m == 0;
|
||||
+
|
||||
dual_timestamp_get(&e->timestamp);
|
||||
|
||||
for (i = 0; i < m; i++) {
|
||||
@@ -2123,7 +2126,7 @@ _public_ int sd_event_run(sd_event *e, u
|
||||
|
||||
p = event_next_pending(e);
|
||||
if (!p) {
|
||||
- r = 1;
|
||||
+ r = !timedout;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
From b27adf354a83ad25f4a209c0a6f7989ecab7b4e2 Mon Sep 17 00:00:00 2001
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Thu, 5 Jun 2014 13:31:25 +0200
|
||||
Subject: [PATCH] bus: make use of sd_bus_try_close() in exit-on-idle services
|
||||
|
||||
---
|
||||
src/libsystemd/sd-bus/bus-util.c | 25 +++++++++++++++++++++++--
|
||||
1 file changed, 23 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git src/libsystemd/sd-bus/bus-util.c src/libsystemd/sd-bus/bus-util.c
|
||||
index 6bd21cc..6441c5b 100644
|
||||
--- src/libsystemd/sd-bus/bus-util.c
|
||||
+++ src/libsystemd/sd-bus/bus-util.c
|
||||
@@ -43,7 +43,9 @@ static int name_owner_change_callback(sd_bus *bus, sd_bus_message *m, void *user
|
||||
assert(m);
|
||||
assert(e);
|
||||
|
||||
+ sd_bus_close(bus);
|
||||
sd_event_exit(e, 0);
|
||||
+
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -121,11 +123,30 @@ int bus_event_loop_with_idle(
|
||||
return r;
|
||||
|
||||
if (r == 0 && !exiting) {
|
||||
- r = bus_async_unregister_and_exit(e, bus, name);
|
||||
+
|
||||
+ r = sd_bus_try_close(bus);
|
||||
+ if (r == -EBUSY)
|
||||
+ continue;
|
||||
+
|
||||
+ if (r == -ENOTSUP) {
|
||||
+ /* Fallback for dbus1 connections: we
|
||||
+ * unregister the name and wait for
|
||||
+ * the response to come through for
|
||||
+ * it */
|
||||
+
|
||||
+ r = bus_async_unregister_and_exit(e, bus, name);
|
||||
+ if (r < 0)
|
||||
+ return r;
|
||||
+
|
||||
+ exiting = true;
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
- exiting = true;
|
||||
+ sd_event_exit(e, 0);
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
1.7.9.2
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 6 10:24:19 UTC 2014 - werner@suse.de
|
||||
|
||||
- Add upstream patches
|
||||
0001-sd-event-restore-correct-timeout-behaviour.patch
|
||||
0002-bus-make-use-of-sd_bus_try_close-in-exit-on-idle-ser.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 5 13:29:20 UTC 2014 - werner@suse.de
|
||||
|
||||
|
||||
@ -140,6 +140,9 @@ Requires(post): pam-config
|
||||
%endif
|
||||
Requires(pre): /usr/bin/getent
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
Requires(post): /usr/bin/awk
|
||||
Requires(post): /usr/bin/getent
|
||||
Requires(post): /usr/bin/setfacl
|
||||
Conflicts: filesystem < 11.5
|
||||
Conflicts: mkinitrd < 2.7.0
|
||||
Obsoletes: systemd-analyze < 201
|
||||
@ -482,56 +485,60 @@ Patch242: 0004-machined-make-sure-GetMachineAddresses-is-available-.patch
|
||||
Patch243: 0005-core-Filter-by-state-behind-the-D-Bus-API-not-in-the.patch
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/20
|
||||
Patch244: 0006-login-add-mir-to-the-list-of-session-types.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/20
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/20
|
||||
Patch245: 0007-logind-fix-Display-property-of-user-objects.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch246: 0001-hwdb-update.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch247: 0002-hwdb-update.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch248: 0003-hwdb-PCI-include-primary-model-string-in-subsystem-m.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch249: 0004-hwdb-update.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch250: 0005-hwdb-update.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch251: 0001-journal-cleanup-up-error-handling-in-update_catalog.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch252: 0002-journal-properly-detect-language-specified-in-line.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch253: 0003-man-mention-XDG_CONFIG_HOME-in-systemd.unit.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch254: 0001-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch255: 0002-keymap-Asus-EeePC-touchpad-toggle-key.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch256: 0001-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch257: 0002-nspawn-restore-journal-directory-is-empty-check.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch258: 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch259: 0004-socket-properly-handle-if-our-service-vanished-durin.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/27
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/27
|
||||
Patch260: 0001-Do-not-unescape-unit-names-in-Install-section.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/27
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/27
|
||||
Patch261: 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch262: 0001-virt-rework-container-detection-logic.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch263: 0002-fsck-include-device-name-in-the-message-about-missin.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch264: 0003-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch265: 0004-util-ignore_file-should-not-allow-files-ending-with.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch266: 0006-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch267: 0007-keyboard-add-Plantronics-.Audio-mute-button.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch268: 0001-build-sys-use-glibc-s-xattr-support-instead-of-requi.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/05
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/05
|
||||
Patch269: 0001-hwdb-fix-case-sensitive-match.patch
|
||||
# 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
|
||||
|
||||
# UDEV PATCHES
|
||||
# ============
|
||||
@ -577,15 +584,15 @@ Patch1017: 1017-udev-serialize-synchronize-block-device-event-handli.patch
|
||||
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
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch
|
||||
# PATCH-FIX-SUSE 1021-udev-re-add-persistent-net-rules.patch
|
||||
Patch1021: 1021-udev-re-add-persistent-net-rules.patch
|
||||
# PATCHFIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
|
||||
# PATCH-FIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
|
||||
Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch1024: 1024-udev-always-close-lock-file-descriptor.patch
|
||||
|
||||
%define util_linux_version %(rpm -q util-linux --qf '%%{VERSION}' | awk -F . '{printf "%%2.2d%%2.2d%%2.2d", $1, $2, $3}')
|
||||
@ -1016,6 +1023,8 @@ cp %{SOURCE7} m4/
|
||||
%patch267 -p0
|
||||
%patch268 -p0
|
||||
%patch269 -p0
|
||||
%patch270 -p0
|
||||
%patch271 -p0
|
||||
|
||||
# udev patches
|
||||
%patch1001 -p1
|
||||
@ -1304,7 +1313,7 @@ do
|
||||
done
|
||||
%endif
|
||||
|
||||
%if 0%{suse_version} < 1310
|
||||
%if 0%{suse_version} <= 1310
|
||||
cat > %{buildroot}/%{_prefix}/lib/systemd/system/fix.service <<-'EOF'
|
||||
[Unit]
|
||||
Description=Fix against deadlock at shutdown
|
||||
@ -1345,8 +1354,14 @@ exit 0
|
||||
/usr/bin/systemctl daemon-reexec >/dev/null 2>&1 || :
|
||||
/usr/bin/journalctl --update-catalog >/dev/null 2>&1 || :
|
||||
# Make sure new journal files
|
||||
chgrp systemd-journal %{_localstatedir}/log/journal/ %{_localstatedir}/log/journal/`cat /etc/machine-id 2> /dev/null` >/dev/null 2>&1 || :
|
||||
chmod g+s %{_localstatedir}/log/journal/ %{_localstatedir}/log/journal/`cat /etc/machine-id 2> /dev/null` >/dev/null 2>&1 || :
|
||||
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
|
||||
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 || :
|
||||
|
||||
# Try to read default runlevel from the old inittab if it exists
|
||||
if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then
|
||||
@ -1498,8 +1513,8 @@ getent group systemd-journal >/dev/null || groupadd -r systemd-journal || :
|
||||
exit 0
|
||||
|
||||
%post logger
|
||||
getent group wheel && setfacl -Rnm g:wheel:rx,d:g:wheel:rx /var/log/journal/ || :
|
||||
getent group adm && setfacl -Rnm g:adm:rx,d:g:adm:rx /var/log/journal/ || :
|
||||
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 || :
|
||||
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 || :
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 6 10:24:19 UTC 2014 - werner@suse.de
|
||||
|
||||
- Add upstream patches
|
||||
0001-sd-event-restore-correct-timeout-behaviour.patch
|
||||
0002-bus-make-use-of-sd_bus_try_close-in-exit-on-idle-ser.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 5 13:29:20 UTC 2014 - werner@suse.de
|
||||
|
||||
|
||||
83
systemd.spec
83
systemd.spec
@ -135,6 +135,9 @@ Requires(post): pam-config
|
||||
%endif
|
||||
Requires(pre): /usr/bin/getent
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
Requires(post): /usr/bin/awk
|
||||
Requires(post): /usr/bin/getent
|
||||
Requires(post): /usr/bin/setfacl
|
||||
Conflicts: filesystem < 11.5
|
||||
Conflicts: mkinitrd < 2.7.0
|
||||
Obsoletes: systemd-analyze < 201
|
||||
@ -477,56 +480,60 @@ Patch242: 0004-machined-make-sure-GetMachineAddresses-is-available-.patch
|
||||
Patch243: 0005-core-Filter-by-state-behind-the-D-Bus-API-not-in-the.patch
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/20
|
||||
Patch244: 0006-login-add-mir-to-the-list-of-session-types.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/20
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/20
|
||||
Patch245: 0007-logind-fix-Display-property-of-user-objects.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch246: 0001-hwdb-update.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch247: 0002-hwdb-update.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch248: 0003-hwdb-PCI-include-primary-model-string-in-subsystem-m.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch249: 0004-hwdb-update.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch250: 0005-hwdb-update.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch251: 0001-journal-cleanup-up-error-handling-in-update_catalog.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch252: 0002-journal-properly-detect-language-specified-in-line.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/21
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/21
|
||||
Patch253: 0003-man-mention-XDG_CONFIG_HOME-in-systemd.unit.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch254: 0001-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch255: 0002-keymap-Asus-EeePC-touchpad-toggle-key.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch256: 0001-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch257: 0002-nspawn-restore-journal-directory-is-empty-check.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch258: 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch259: 0004-socket-properly-handle-if-our-service-vanished-durin.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/27
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/27
|
||||
Patch260: 0001-Do-not-unescape-unit-names-in-Install-section.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/27
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/27
|
||||
Patch261: 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch262: 0001-virt-rework-container-detection-logic.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch263: 0002-fsck-include-device-name-in-the-message-about-missin.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch264: 0003-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch265: 0004-util-ignore_file-should-not-allow-files-ending-with.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch266: 0006-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch267: 0007-keyboard-add-Plantronics-.Audio-mute-button.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch268: 0001-build-sys-use-glibc-s-xattr-support-instead-of-requi.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/05
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/05
|
||||
Patch269: 0001-hwdb-fix-case-sensitive-match.patch
|
||||
# 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
|
||||
|
||||
# UDEV PATCHES
|
||||
# ============
|
||||
@ -572,15 +579,15 @@ Patch1017: 1017-udev-serialize-synchronize-block-device-event-handli.patch
|
||||
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
|
||||
# PATCHFIX-UPSTREAM added at 2014/05/26
|
||||
# PATCH-FIX-UPSTREAM added at 2014/05/26
|
||||
Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch
|
||||
# PATCH-FIX-SUSE 1021-udev-re-add-persistent-net-rules.patch
|
||||
Patch1021: 1021-udev-re-add-persistent-net-rules.patch
|
||||
# PATCHFIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
|
||||
# PATCH-FIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
|
||||
Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
|
||||
# PATCHFIX-UPSTREAM added at 2014/06/03
|
||||
# PATCH-FIX-UPSTREAM added at 2014/06/03
|
||||
Patch1024: 1024-udev-always-close-lock-file-descriptor.patch
|
||||
|
||||
%define util_linux_version %(rpm -q util-linux --qf '%%{VERSION}' | awk -F . '{printf "%%2.2d%%2.2d%%2.2d", $1, $2, $3}')
|
||||
@ -1011,6 +1018,8 @@ cp %{SOURCE7} m4/
|
||||
%patch267 -p0
|
||||
%patch268 -p0
|
||||
%patch269 -p0
|
||||
%patch270 -p0
|
||||
%patch271 -p0
|
||||
|
||||
# udev patches
|
||||
%patch1001 -p1
|
||||
@ -1299,7 +1308,7 @@ do
|
||||
done
|
||||
%endif
|
||||
|
||||
%if 0%{suse_version} < 1310
|
||||
%if 0%{suse_version} <= 1310
|
||||
cat > %{buildroot}/%{_prefix}/lib/systemd/system/fix.service <<-'EOF'
|
||||
[Unit]
|
||||
Description=Fix against deadlock at shutdown
|
||||
@ -1340,8 +1349,14 @@ exit 0
|
||||
/usr/bin/systemctl daemon-reexec >/dev/null 2>&1 || :
|
||||
/usr/bin/journalctl --update-catalog >/dev/null 2>&1 || :
|
||||
# Make sure new journal files
|
||||
chgrp systemd-journal %{_localstatedir}/log/journal/ %{_localstatedir}/log/journal/`cat /etc/machine-id 2> /dev/null` >/dev/null 2>&1 || :
|
||||
chmod g+s %{_localstatedir}/log/journal/ %{_localstatedir}/log/journal/`cat /etc/machine-id 2> /dev/null` >/dev/null 2>&1 || :
|
||||
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
|
||||
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 || :
|
||||
|
||||
# Try to read default runlevel from the old inittab if it exists
|
||||
if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then
|
||||
@ -1493,8 +1508,8 @@ getent group systemd-journal >/dev/null || groupadd -r systemd-journal || :
|
||||
exit 0
|
||||
|
||||
%post logger
|
||||
getent group wheel && setfacl -Rnm g:wheel:rx,d:g:wheel:rx /var/log/journal/ || :
|
||||
getent group adm && setfacl -Rnm g:adm:rx,d:g:adm:rx /var/log/journal/ || :
|
||||
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 || :
|
||||
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 || :
|
||||
|
||||
Loading…
Reference in New Issue
Block a user