From 6839d68d3b6954ef162635034541d0981ce48bf8f147ed3e86399770dbeaa904 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 14 Mar 2014 14:27:16 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=563 --- getty-generator-with-serial-3270-tty.patch | 34 ++++++++++++++++++++++ systemd-mini.changes | 28 +++++++++++------- systemd-mini.spec | 3 ++ systemd.changes | 28 +++++++++++------- systemd.spec | 3 ++ 5 files changed, 74 insertions(+), 22 deletions(-) create mode 100644 getty-generator-with-serial-3270-tty.patch diff --git a/getty-generator-with-serial-3270-tty.patch b/getty-generator-with-serial-3270-tty.patch new file mode 100644 index 00000000..41a2e278 --- /dev/null +++ b/getty-generator-with-serial-3270-tty.patch @@ -0,0 +1,34 @@ +The path for the serial 3270 console looks like (dev/)3270/tty1 which +causes trouble in the systemd-getty-generator as the add_symlink() +tries to make directories for each slash even for the slash after +the @ symbol in the final link name. + +--- + getty-generator.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- systemd-210/src/getty-generator/getty-generator.c ++++ systemd-210/src/getty-generator/getty-generator.c 2014-03-14 14:13:09.296463091 +0000 +@@ -67,6 +67,7 @@ static int add_symlink(const char *fserv + + static int add_serial_getty(const char *tty) { + _cleanup_free_ char *n = NULL; ++ char *at; + + assert(tty); + +@@ -76,6 +77,14 @@ static int add_serial_getty(const char * + if (!n) + return log_oom(); + ++ if ((at = strchr(n, '@'))) { ++ char *sl; ++ while (*(++at) && (sl = strchr(at, '/'))) { ++ *sl = '-'; ++ at = sl; ++ } ++ } ++ + return add_symlink("serial-getty@.service", n); + } + diff --git a/systemd-mini.changes b/systemd-mini.changes index 1ab95ff7..80282770 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 14 14:24:56 UTC 2014 - werner@suse.de + +- Add patch getty-generator-with-serial-3270-tty.patch to avoid + harmless error messages on not existing getty@3270 files + ------------------------------------------------------------------- Fri Mar 14 11:07:29 UTC 2014 - werner@suse.de @@ -66,6 +72,17 @@ Tue Mar 11 07:47:55 UTC 2014 - werner@suse.de - Make compeletion file parser work (bnc#867664) +------------------------------------------------------------------- +Fri Mar 7 14:50:39 CET 2014 - hare@suse.de + +- Integrate powerd handling in initctl service + + Remove 1016-support-powerfail-with-powerstatus.patch + + Remove systemd-powerfail + + Add systemd-powerd-initctl-support.patch +- Remove 61-msft.rules; superseded by sg3_utils (bnc#866933) +- Persistent by-path links for ATA devices (FATE#317063) + + Update 1001-re-enable-by_path-links-for-ata-devices.patch + ------------------------------------------------------------------- Fri Mar 7 09:25:53 UTC 2014 - werner@suse.de @@ -90,17 +107,6 @@ Fri Mar 7 08:00:31 UTC 2014 - werner@suse.de - Add linker scripts as place holder of the old systemd shared libraries now all included in libsystemd.so (bnc#867128) -------------------------------------------------------------------- -Fri Mar 7 14:50:39 CET 2014 - hare@suse.de - -- Integrate powerd handling in initctl service - + Remove 1016-support-powerfail-with-powerstatus.patch - + Remove systemd-powerfail - + Add systemd-powerd-initctl-support.patch -- Remove 61-msft.rules; superseded by sg3_utils (bnc#866933) -- Persistent by-path links for ATA devices (FATE#317063) - + Update 1001-re-enable-by_path-links-for-ata-devices.patch - ------------------------------------------------------------------- Tue Mar 4 10:37:02 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 0525b79f..c554b30a 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -184,6 +184,8 @@ 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 +# PATCH-FIX-SUSE Avoid error message about not existing getty@3270 file +Patch19: getty-generator-with-serial-3270-tty.patch # 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 @@ -583,6 +585,7 @@ cp %{SOURCE7} m4/ %patch17 -p1 %endif %patch18 -p1 +%patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 diff --git a/systemd.changes b/systemd.changes index 1ab95ff7..80282770 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 14 14:24:56 UTC 2014 - werner@suse.de + +- Add patch getty-generator-with-serial-3270-tty.patch to avoid + harmless error messages on not existing getty@3270 files + ------------------------------------------------------------------- Fri Mar 14 11:07:29 UTC 2014 - werner@suse.de @@ -66,6 +72,17 @@ Tue Mar 11 07:47:55 UTC 2014 - werner@suse.de - Make compeletion file parser work (bnc#867664) +------------------------------------------------------------------- +Fri Mar 7 14:50:39 CET 2014 - hare@suse.de + +- Integrate powerd handling in initctl service + + Remove 1016-support-powerfail-with-powerstatus.patch + + Remove systemd-powerfail + + Add systemd-powerd-initctl-support.patch +- Remove 61-msft.rules; superseded by sg3_utils (bnc#866933) +- Persistent by-path links for ATA devices (FATE#317063) + + Update 1001-re-enable-by_path-links-for-ata-devices.patch + ------------------------------------------------------------------- Fri Mar 7 09:25:53 UTC 2014 - werner@suse.de @@ -90,17 +107,6 @@ Fri Mar 7 08:00:31 UTC 2014 - werner@suse.de - Add linker scripts as place holder of the old systemd shared libraries now all included in libsystemd.so (bnc#867128) -------------------------------------------------------------------- -Fri Mar 7 14:50:39 CET 2014 - hare@suse.de - -- Integrate powerd handling in initctl service - + Remove 1016-support-powerfail-with-powerstatus.patch - + Remove systemd-powerfail - + Add systemd-powerd-initctl-support.patch -- Remove 61-msft.rules; superseded by sg3_utils (bnc#866933) -- Persistent by-path links for ATA devices (FATE#317063) - + Update 1001-re-enable-by_path-links-for-ata-devices.patch - ------------------------------------------------------------------- Tue Mar 4 10:37:02 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index a813ce86..7be75e0f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -179,6 +179,8 @@ 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 +# PATCH-FIX-SUSE Avoid error message about not existing getty@3270 file +Patch19: getty-generator-with-serial-3270-tty.patch # 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 @@ -578,6 +580,7 @@ cp %{SOURCE7} m4/ %patch17 -p1 %endif %patch18 -p1 +%patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1