From 52c1a80926ee4979a0c5c3c6f23c35cc4b84eb195b08b15254cc077446fe6e24 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 15 Jul 2014 07:40:33 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=717 --- systemd-mini.changes | 10 ++++++++-- systemd-mini.spec | 4 ++++ systemd.changes | 6 ++++++ systemd.spec | 4 ++++ vhangup-on-all-consoles.patch | 28 ++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 vhangup-on-all-consoles.patch diff --git a/systemd-mini.changes b/systemd-mini.changes index bec1e1f7..8b442b0c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,10 +1,16 @@ ------------------------------------------------------------------- -Tue Jul 15 06:33:01 UTC 2014 - jlee@suse.com +Tue Jul 15 07:39:40 UTC 2014 - werner@suse.de + +- Add patch vhangup-on-all-consoles.patch that is do a vhangup on + lines (bnc#886599) + +------------------------------------------------------------------- +Tue Jul 15 06:29:54 UTC 2014 - jlee@suse.com - Removed %{_libexecdir}/modules-load.d/efivars.conf because the kernel patch of autoload efivars driver accepted by linux-efi upstream. (bnc#881559) - https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/commit/?h=next&id=be756a5327fe3d4686d74d3e9b273010424e230c + https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/commit/?h=next&id=be756a5327fe3d4686d74d3e9b273010424e230c ------------------------------------------------------------------- Mon Jul 14 14:53:21 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 46efd2d1..1bf3d7a8 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -146,6 +146,7 @@ Requires: netcfg Requires: pam-config >= 0.79-5 Requires: pwdutils Requires: systemd-presets-branding +Requires: sysvinit-tools Requires: util-linux >= 2.21 Requires(post): coreutils Requires(post): findutils @@ -692,6 +693,8 @@ Patch335: 0002-util-fix-has-cc-check-and-add-test.patch 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 +# PATCH-FIX-SUSE Do a vhangup on all consoles lines (bnc#886599) +Patch338: vhangup-on-all-consoles.patch # UDEV PATCHES # ============ @@ -1292,6 +1295,7 @@ cp %{SOURCE7} m4/ %patch335 -p0 %patch336 -p0 %patch337 -p0 +%patch338 -p0 # udev patches %patch1001 -p1 diff --git a/systemd.changes b/systemd.changes index 32b88f5e..8b442b0c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 15 07:39:40 UTC 2014 - werner@suse.de + +- Add patch vhangup-on-all-consoles.patch that is do a vhangup on + lines (bnc#886599) + ------------------------------------------------------------------- Tue Jul 15 06:29:54 UTC 2014 - jlee@suse.com diff --git a/systemd.spec b/systemd.spec index 71e8fb9f..cb9e3201 100644 --- a/systemd.spec +++ b/systemd.spec @@ -141,6 +141,7 @@ Requires: netcfg Requires: pam-config >= 0.79-5 Requires: pwdutils Requires: systemd-presets-branding +Requires: sysvinit-tools Requires: util-linux >= 2.21 Requires(post): coreutils Requires(post): findutils @@ -687,6 +688,8 @@ Patch335: 0002-util-fix-has-cc-check-and-add-test.patch 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 +# PATCH-FIX-SUSE Do a vhangup on all consoles lines (bnc#886599) +Patch338: vhangup-on-all-consoles.patch # UDEV PATCHES # ============ @@ -1287,6 +1290,7 @@ cp %{SOURCE7} m4/ %patch335 -p0 %patch336 -p0 %patch337 -p0 +%patch338 -p0 # udev patches %patch1001 -p1 diff --git a/vhangup-on-all-consoles.patch b/vhangup-on-all-consoles.patch new file mode 100644 index 00000000..b318b124 --- /dev/null +++ b/vhangup-on-all-consoles.patch @@ -0,0 +1,28 @@ +Related to bnc#886599 and others. That is use the vhangup(8) tool +to explicit do a virtually hangup on the specified on the terminal +line to give e.g. the bash a few seconds to e.g. safe its history. + +--- + units/getty@.service.m4 | 1 + + units/serial-getty@.service.m4 | 1 + + 2 files changed, 2 insertions(+) +--- units/getty@.service.m4 ++++ units/getty@.service.m4 2014-07-15 07:30:28.006235859 +0000 +@@ -29,6 +29,7 @@ ConditionPathExists=/dev/tty0 + [Service] + # the VT is cleared by TTYVTDisallocate + ExecStart=-/sbin/agetty --noclear %I $TERM ++ExecStopPost=-/sbin/vhangup /dev/%I + Type=idle + Restart=always + RestartSec=0 +--- units/serial-getty@.service.m4 ++++ units/serial-getty@.service.m4 2014-07-15 07:30:01.366235017 +0000 +@@ -24,6 +24,7 @@ IgnoreOnIsolate=yes + + [Service] + ExecStart=-/sbin/agetty --keep-baud %I 115200,38400,9600 $TERM ++ExecStopPost=-/sbin/vhangup /dev/%I + Type=idle + Restart=always + RestartSec=0