Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2016-01-20 09:54:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth"
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2015-12-18 21:52:59.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2016-01-20 09:54:02.000000000 +0100
@@ -1,0 +2,32 @@
+Mon Dec 28 14:48:48 UTC 2015 - dimstar@opensuse.org
+
+- Update to version 0.9.2:
+ + two-step: Add separate startup / shutdown animations.
+ + device-manager: try fb device if drm device failed.
+ + Port to GTK+ 3.0.
+ + script support system update events.
+ + Drop the obsolete log-viewer
+- Rebase patches:
+ + plymouth-fix-window-size
+ + stop-graphical.patch
+ + 0001-Some-greenish-openSUSE-colors.patch
+ + fix-serial-consoles.patch
+ + 0001-seats-guard-against-NULL-terminal.patch
+ + plymouth-ignore-cirrusdrm.patch
+ + plymouth-boot-vga-framebuffer.patch
+ + 0001-let-it-become-a-real-daemon.patch
+- Drop upstream fixed patches:
+ + 0001-device-manager-only-call-ply_terminal_free.patch
+ + 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch
+ + 0001-splash-do-not-process-display-lists-if-it-is-empty.patch
+ + 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch
+ + 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch
+ + 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch
+- Replace pkgconfig(gtk+-2.0) BuildRequires with
+ pkgconfig(gtk+-3.0), following upstreams port to GTK+ 3.0.
+- Rename library subpackage from *2 to *4, followings upstreams
+ soname bump.
+- Drop utils subpackage: the log-viewer, which was the only tool
+ left, has been dropped.
+
+-------------------------------------------------------------------
Old:
----
0001-device-manager-only-call-ply_terminal_free.patch
0001-libply-splash-core-also-monitor-for-file-removal-in-.patch
0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch
0001-splash-do-not-process-display-lists-if-it-is-empty.patch
0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch
0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch
plymouth-0.9.0.tar.bz2
New:
----
plymouth-0.9.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:04.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:04.000000000 +0100
@@ -22,13 +22,13 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
-Version: 0.9.0
+Version: 0.9.2
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0+
Group: System/Base
Url: http://freedesktop.org/software/plymouth/releases
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
Source1: boot-duration
# PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes
Patch3: plymouth-fix-window-size
@@ -42,24 +42,12 @@
# PATCH-FIX-UPSTREAM plymouth-manpages.patch idoenmez@suse.de -- Fix man page installation
Patch17: plymouth-manpages.patch
Patch18: fix-serial-consoles.patch
-# PATCH-FIX-UPSTREAM 0001-device-manager-only-call-ply_terminal_free.patch fcrozat@suse.com -- Fix crash
-Patch19: 0001-device-manager-only-call-ply_terminal_free.patch
# PATCH-FIX-OPENSUSE use-mkinitrd.patch fcrozat@suse.com -- call mkinitrd -B for now
Patch20: use-mkinitrd.patch
# PATCH-FIX-UPSTREAM 0001-seats-guard-against-NULL-terminal.patch fcrozat@suse.com -- guard against null terminal
Patch21: 0001-seats-guard-against-NULL-terminal.patch
-# PATCH-FIX-UPSTREAM 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch fcrozat@suse.com -- prevent crash if pixel display is removed
-Patch22: 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch
-# PATCH-FIX-UPSTREAM 0001-splash-do-not-process-display-lists-if-it-is-empty.patch fcrozat@suse.com -- do no crash when removing displays
-Patch23: 0001-splash-do-not-process-display-lists-if-it-is-empty.patch
-# PATCH-FIX-UPSTREAM 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch fcrozat@suse.com -- handle recent udev
-Patch24: 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch
-# PATCH-FIX-UPSTREAM 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch fcrozat@suse.com -- handle empty seat better
-Patch25: 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch
# PATCH-FIX-UPSTREAM plymouth-ignore-cirrusdrm.patch fcrozat@suse.com -- ignore cirrusdrm, use fb instead
Patch26: plymouth-ignore-cirrusdrm.patch
-# PATCH-FIX-UPSTREAM 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch bnc#886148 fcrozat@suse.com -- fix UTF-8 code for square
-Patch27: 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch
Patch28: plymouth-boot-vga-framebuffer.patch
Patch29: 0001-let-it-become-a-real-daemon.patch
@@ -73,6 +61,7 @@
BuildRequires: systemd >= 186
BuildRequires: update-desktop-files
BuildRequires: xz
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(systemd) >= 186
Requires(post): coreutils
@@ -94,36 +83,36 @@
messages are instead redirected to a log file for viewing
after boot.
-%package -n libply-boot-client2
+%package -n libply-boot-client4
Summary: Plymouth core library
Group: Development/Libraries/C and C++
-%description -n libply-boot-client2
+%description -n libply-boot-client4
This package contains the libply-boot-client library used by Plymouth.
-%package -n libply-splash-core2
+%package -n libply-splash-core4
Summary: Plymouth core library
Group: Development/Libraries/C and C++
-%description -n libply-splash-core2
+%description -n libply-splash-core4
This package contains the libply-splash-core library
used by graphical Plymouth splashes.
-%package -n libply-splash-graphics2
+%package -n libply-splash-graphics4
Summary: Plymouth graphics libraries
Group: Development/Libraries/C and C++
BuildRequires: libpng-devel
-%description -n libply-splash-graphics2
+%description -n libply-splash-graphics4
This package contains the libply-splash-graphics library
used by graphical Plymouth splashes.
-%package -n libply2
+%package -n libply4
Summary: Plymouth core library
Group: Development/Libraries/C and C++
-Requires: libply-boot-client2 = %{version}
+Requires: libply-boot-client4 = %{version}
-%description -n libply2
+%description -n libply4
This package contains the libply library used by Plymouth.
%package devel
@@ -131,26 +120,16 @@
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: %{name}-x11-renderer = %{version}
-Requires: libply-boot-client2 = %{version}
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-boot-client4 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
Requires: pkgconfig
%description devel
This package contains the libply and libplybootsplash libraries
and headers needed to develop 3rd party splash plugins for Plymouth.
-%package utils
-Summary: Plymouth related utilities
-Group: System/Base
-BuildRequires: pkgconfig(gtk+-2.0)
-Requires: %{name} = %{version}
-
-%description utils
-This package contains utilities that integrate with Plymouth
-including a boot log viewing application.
-
%package dracut
Summary: Plymouth related utilities for dracut
Group: System/Base
@@ -187,7 +166,7 @@
Group: System/Base
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(pango) >= 1.21.0
-Requires: libply-splash-core2 = %{version}
+Requires: libply-splash-core4 = %{version}
%description plugin-label
This package contains the label control plugin for
@@ -197,9 +176,9 @@
%package plugin-fade-throbber
Summary: Plymouth "Fade-Throbber" plugin
Group: System/Base
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
%description plugin-fade-throbber
This package contains the "Fade-In" boot splash plugin for
@@ -210,9 +189,9 @@
Summary: Plymouth "Throbgress" plugin
Group: System/Base
Requires: %{name}-plugin-label = %{version}
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
%description plugin-throbgress
This package contains the "throbgress" boot splash plugin for
@@ -224,9 +203,9 @@
Summary: Plymouth "space-flares" plugin
Group: System/Base
Requires: %{name}-plugin-label = %{version}
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
%description plugin-space-flares
This package contains the "space-flares" boot splash plugin for
@@ -235,9 +214,9 @@
%package plugin-two-step
Summary: Plymouth "two-step" plugin
Group: System/Base
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
Requires: plymouth-plugin-label = %{version}
%description plugin-two-step
@@ -249,9 +228,9 @@
%package plugin-script
Summary: Plymouth "script" plugin
Group: System/Base
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
%description plugin-script
This package contains the "script" boot splash plugin for
@@ -262,9 +241,9 @@
%package plugin-tribar
Summary: Plymouth "script" plugin
Group: System/Base
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
%description plugin-tribar
This package contains the "tribar" boot splash plugin for
@@ -352,15 +331,9 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
-%patch19 -p1
%patch20 -p1
%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
%patch26 -p1
-%patch27 -p1
%patch28 -p1
%patch29 -p1
@@ -385,7 +358,6 @@
--with-background-color=0x3391cd \
--disable-gdm-transition \
--without-system-root-install \
- --with-log-viewer \
--without-rhgb-compat-link \
--with-boot-tty=/dev/tty7 \
--with-shutdown-tty=/dev/tty1 \
@@ -438,21 +410,21 @@
%posttrans
%{?regenerate_initrd_posttrans}
-%post -n libply-boot-client2 -p /sbin/ldconfig
+%post -n libply-boot-client4 -p /sbin/ldconfig
-%postun -n libply-boot-client2 -p /sbin/ldconfig
+%postun -n libply-boot-client4 -p /sbin/ldconfig
-%post -n libply-splash-core2 -p /sbin/ldconfig
+%post -n libply-splash-core4 -p /sbin/ldconfig
-%postun -n libply-splash-core2 -p /sbin/ldconfig
+%postun -n libply-splash-core4 -p /sbin/ldconfig
-%post -n libply-splash-graphics2 -p /sbin/ldconfig
+%post -n libply-splash-graphics4 -p /sbin/ldconfig
-%postun -n libply-splash-graphics2 -p /sbin/ldconfig
+%postun -n libply-splash-graphics4 -p /sbin/ldconfig
-%post -n libply2 -p /sbin/ldconfig
+%post -n libply4 -p /sbin/ldconfig
-%postun -n libply2 -p /sbin/ldconfig
+%postun -n libply4 -p /sbin/ldconfig
%post theme-spinfinity
if [ $1 -eq 1 ]; then
@@ -568,21 +540,21 @@
%{_libdir}/pkgconfig/ply-boot-client.pc
%{_includedir}/plymouth-1
-%files -n libply-boot-client2
+%files -n libply-boot-client4
%defattr(-, root, root)
-%{_libdir}/libply-boot-client.so.2*
+%{_libdir}/libply-boot-client.so.4*
-%files -n libply-splash-core2
+%files -n libply-splash-core4
%defattr(-, root, root)
-%{plymouth_libdir}/libply-splash-core.so.2*
+%{plymouth_libdir}/libply-splash-core.so.4*
-%files -n libply-splash-graphics2
+%files -n libply-splash-graphics4
%defattr(-, root, root)
-%{_libdir}/libply-splash-graphics.so.2*
+%{_libdir}/libply-splash-graphics.so.4*
-%files -n libply2
+%files -n libply4
%defattr(-, root, root)
-%{plymouth_libdir}/libply.so.2*
+%{plymouth_libdir}/libply.so.4*
%files scripts
%defattr(-, root, root)
@@ -590,10 +562,6 @@
%{_sbindir}/plymouth-set-default-theme
%{_libexecdir}/plymouth/plymouth-update-initrd
-%files utils
-%defattr(-, root, root)
-%{_bindir}/plymouth-log-viewer
-
%files x11-renderer
%defattr(-,root,root,-)
%{_libdir}/plymouth/renderers/x11*
++++++ 0001-Some-greenish-openSUSE-colors.patch ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:04.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:04.000000000 +0100
@@ -7,45 +7,41 @@
src/plugins/splash/text/plugin.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
-Index: plymouth-0.9.0/src/plugins/splash/text/plugin.c
+Index: plymouth-0.9.2/src/plugins/splash/text/plugin.c
===================================================================
---- plymouth-0.9.0.orig/src/plugins/splash/text/plugin.c
-+++ plymouth-0.9.0/src/plugins/splash/text/plugin.c
-@@ -174,13 +174,13 @@ view_start_animation (view_t *view)
- 0x000000);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_WHITE,
-- 0xffffff);
-+ 0x40ff00);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BLUE,
-- 0x3465a4);
-+ 0x20a000);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BROWN,
-- 0x979a9b);
-+ 0x106000);
+--- plymouth-0.9.2.orig/src/plugins/splash/text/plugin.c
++++ plymouth-0.9.2/src/plugins/splash/text/plugin.c
+@@ -174,10 +174,10 @@ view_start_animation (view_t *view)
+ 0x2e3436);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_WHITE,
+- 0xffffff);
++ 0x40ff00);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_BROWN,
+- 0x979a9b);
++ 0x106000);
- ply_text_display_set_background_color (view->display,
- PLY_TERMINAL_COLOR_BLACK);
-Index: plymouth-0.9.0/src/plugins/splash/tribar/plugin.c
+ ply_text_display_set_background_color (view->display,
+ PLY_TERMINAL_COLOR_BLACK);
+Index: plymouth-0.9.2/src/plugins/splash/tribar/plugin.c
===================================================================
---- plymouth-0.9.0.orig/src/plugins/splash/tribar/plugin.c
-+++ plymouth-0.9.0/src/plugins/splash/tribar/plugin.c
+--- plymouth-0.9.2.orig/src/plugins/splash/tribar/plugin.c
++++ plymouth-0.9.2/src/plugins/splash/tribar/plugin.c
@@ -177,13 +177,13 @@ view_start_animation (view_t *view)
- 0x000000);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_WHITE,
-- 0xffffff);
-+ 0x40ff00);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BLUE,
-- 0x0073B3);
-+ 0x20a000);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BROWN,
-- 0x00457E);
-+ 0x106000);
+ 0x000000);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_WHITE,
+- 0xffffff);
++ 0x40ff00);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_BLUE,
+- 0x0073B3);
++ 0x20a000);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_BROWN,
+- 0x00457E);
++ 0x106000);
- ply_text_display_set_background_color (view->display,
- PLY_TERMINAL_COLOR_BLACK);
+ ply_text_display_set_background_color (view->display,
+ PLY_TERMINAL_COLOR_BLACK);
++++++ 0001-let-it-become-a-real-daemon.patch ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:04.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:04.000000000 +0100
@@ -13,13 +13,13 @@
plymouth-0.9.0/src/main.c | 42 +++++++------
5 files changed, 43 insertions(+), 18 deletions(-)
-Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c
+Index: plymouth-0.9.2/src/libply-splash-core/ply-device-manager.c
===================================================================
---- plymouth-0.9.0.orig/src/libply-splash-core/ply-device-manager.c
-+++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c
-@@ -933,3 +933,12 @@ ply_device_manager_deactivate_keyboards
- node = next_node;
- }
+--- plymouth-0.9.2.orig/src/libply-splash-core/ply-device-manager.c
++++ plymouth-0.9.2/src/libply-splash-core/ply-device-manager.c
+@@ -926,3 +926,12 @@ ply_device_manager_deactivate_keyboards
+ node = next_node;
+ }
}
+
+void
@@ -30,11 +30,11 @@
+ ply_terminal_close,
+ manager);
+}
-Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.h
+Index: plymouth-0.9.2/src/libply-splash-core/ply-device-manager.h
===================================================================
---- plymouth-0.9.0.orig/src/libply-splash-core/ply-device-manager.h
-+++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.h
-@@ -49,6 +49,7 @@ void ply_device_manager_deactivate_keybo
+--- plymouth-0.9.2.orig/src/libply-splash-core/ply-device-manager.h
++++ plymouth-0.9.2/src/libply-splash-core/ply-device-manager.h
+@@ -52,6 +52,7 @@ void ply_device_manager_deactivate_keybo
void ply_device_manager_activate_renderers (ply_device_manager_t *manager);
void ply_device_manager_deactivate_renderers (ply_device_manager_t *manager);
ply_terminal_t *ply_device_manager_get_default_terminal (ply_device_manager_t *manager);
@@ -42,150 +42,147 @@
#endif
-Index: plymouth-0.9.0/src/libply/ply-utils.c
+Index: plymouth-0.9.2/src/libply/ply-utils.c
===================================================================
---- plymouth-0.9.0.orig/src/libply/ply-utils.c
-+++ plymouth-0.9.0/src/libply/ply-utils.c
+--- plymouth-0.9.2.orig/src/libply/ply-utils.c
++++ plymouth-0.9.2/src/libply/ply-utils.c
@@ -77,6 +77,7 @@
static int errno_stack[PLY_ERRNO_STACK_SIZE];
static int errno_stack_position = 0;
+static bool inChild = false;
- bool
+ bool
ply_open_unidirectional_pipe (int *sender_fd,
-@@ -797,6 +798,7 @@ ply_create_daemon (void)
- {
- int read_error = errno;
- int status;
-+ inChild = true;
-
- if (waitpid (pid, &status, WNOHANG) <= 0)
- {
-@@ -843,6 +845,9 @@ ply_detach_daemon (ply_daemon_handle_t *
- close (sender_fd);
- free (handle);
+@@ -771,6 +772,7 @@ ply_create_daemon (void)
+ if (!ply_read (receiver_fd, &byte, sizeof(uint8_t))) {
+ int read_error = errno;
+ int status;
++ inChild = true;
+
+ if (waitpid (pid, &status, WNOHANG) <= 0)
+ ply_error ("failed to read status from child immediately after starting to daemonize: %s", strerror (read_error));
+@@ -811,6 +813,9 @@ ply_detach_daemon (ply_daemon_handle_t *
+ close (sender_fd);
+ free (handle);
-+ if (inChild)
-+ setsid();
++ if (inChild)
++ setsid();
+
- return true;
+ return true;
}
-Index: plymouth-0.9.0/src/libply/ply-terminal-session.c
+Index: plymouth-0.9.2/src/libply/ply-terminal-session.c
===================================================================
---- plymouth-0.9.0.orig/src/libply/ply-terminal-session.c
-+++ plymouth-0.9.0/src/libply/ply-terminal-session.c
-@@ -187,6 +187,13 @@ ply_terminal_session_redirect_console (p
-
- assert (terminal_name != NULL);
-
-+ fd = open ("/dev/console", O_RDWR | O_NOCTTY);
-+ if (fd >= 0)
-+ {
-+ ioctl (fd, TIOCCONS); /* Undo any current map if any */
-+ close (fd);
-+ }
+--- plymouth-0.9.2.orig/src/libply/ply-terminal-session.c
++++ plymouth-0.9.2/src/libply/ply-terminal-session.c
+@@ -187,6 +187,12 @@ ply_terminal_session_redirect_console (p
+
+ assert (terminal_name != NULL);
+
++ fd = open ("/dev/console", O_RDWR | O_NOCTTY);
++ if (fd >= 0) {
++ ioctl (fd, TIOCCONS); /* Undo any current map if any */
++ close (fd);
++ }
+
- fd = open (terminal_name, O_RDWR | O_NOCTTY);
+ fd = open (terminal_name, O_RDWR | O_NOCTTY);
- if (fd < 0)
-Index: plymouth-0.9.0/src/main.c
+ if (fd < 0)
+Index: plymouth-0.9.2/src/main.c
===================================================================
---- plymouth-0.9.0.orig/src/main.c
-+++ plymouth-0.9.0/src/main.c
-@@ -1042,6 +1042,7 @@ on_seat_added (state_t *state,
-
+--- plymouth-0.9.2.orig/src/main.c
++++ plymouth-0.9.2/src/main.c
+@@ -1026,6 +1026,7 @@ on_seat_added (state_t *state,
+ on_enter, state);
}
+static ply_device_manager_t *manager;
static void
- load_devices (state_t *state,
- ply_device_manager_flags_t flags)
-@@ -1049,6 +1050,8 @@ load_devices (state_t
- state->device_manager = ply_device_manager_new (state->default_tty, flags);
- state->local_console_terminal = ply_device_manager_get_default_terminal (state->device_manager);
+ load_devices (state_t *state,
+ ply_device_manager_flags_t flags)
+@@ -1033,6 +1034,8 @@ load_devices (state_t
+ state->device_manager = ply_device_manager_new (state->default_tty, flags);
+ state->local_console_terminal = ply_device_manager_get_default_terminal (state->device_manager);
-+ manager = state->device_manager;
++ manager = state->device_manager;
+
- ply_device_manager_watch_seats (state->device_manager,
- (ply_seat_added_handler_t)
- on_seat_added,
-@@ -1077,6 +1080,7 @@ quit_splash (state_t *state)
- ply_trace ("Not retaining splash, so deallocating VT");
- ply_terminal_deactivate_vt (state->local_console_terminal);
- ply_terminal_close (state->local_console_terminal);
-+ ply_close_all_terminals (state->device_manager);
+ ply_device_manager_watch_seats (state->device_manager,
+ (ply_seat_added_handler_t)
+ on_seat_added,
+@@ -1058,6 +1061,7 @@ quit_splash (state_t *state)
+ ply_trace ("Not retaining splash, so deallocating VT");
+ ply_terminal_deactivate_vt (state->local_console_terminal);
+ ply_terminal_close (state->local_console_terminal);
++ ply_close_all_terminals (state->device_manager);
+ }
}
- }
-@@ -2075,25 +2079,22 @@ dump_debug_buffer_to_file (void)
- #include