diff --git a/plymouth.changes b/plymouth.changes index 339fe67..2828f0d 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 29 07:59:40 UTC 2017 - qzhao@suse.com + +- Drop stop-graphical.patch: There are no conflicting these days, + obsolete this patch to enable auto switch to TTY when display + server not exist (boo#1066510). + ------------------------------------------------------------------- Wed Jun 14 06:16:48 UTC 2017 - qzhao@suse.com diff --git a/plymouth.spec b/plymouth.spec index 5a59f82..d574e77 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -32,8 +32,6 @@ Source0: %{name}-%{version}.tar.xz Source1: boot-duration # PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes Patch3: plymouth-fix-window-size -# PATCH-OPENSUSE -- Ensure graphical.target is conflicting with plymouth-wait-quit.service -Patch4: stop-graphical.patch # PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin Patch9: plymouth-dracut-path.patch Patch10: 0001-Some-greenish-openSUSE-colors.patch @@ -337,7 +335,6 @@ plugin. %prep %setup -q %patch3 -p1 -%patch4 -p1 %patch9 %patch10 -p1 %patch16 -p1 diff --git a/stop-graphical.patch b/stop-graphical.patch deleted file mode 100644 index 3b03097..0000000 --- a/stop-graphical.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: plymouth-0.9.2/systemd-units/plymouth-quit-wait.service.in -=================================================================== ---- plymouth-0.9.2.orig/systemd-units/plymouth-quit-wait.service.in -+++ plymouth-0.9.2/systemd-units/plymouth-quit-wait.service.in -@@ -1,6 +1,7 @@ - [Unit] - Description=Hold until boot process finishes up - After=rc-local.service plymouth-start.service systemd-user-sessions.service -+Conflicts=graphical.target - - [Service] - ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait -Index: plymouth-0.9.2/systemd-units/plymouth-quit.service.in -=================================================================== ---- plymouth-0.9.2.orig/systemd-units/plymouth-quit.service.in -+++ plymouth-0.9.2/systemd-units/plymouth-quit.service.in -@@ -1,6 +1,7 @@ - [Unit] - Description=Terminate Plymouth Boot Screen - After=rc-local.service plymouth-start.service systemd-user-sessions.service -+Conflicts=graphical.target - - [Service] - ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit