Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory
checked in at 2013-05-02 11:31:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-03-01
10:54:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2013-05-02
11:31:42.000000000 +0200
@@ -1,0 +2,20 @@
+Mon Apr 22 19:47:44 UTC 2013 - crrodrig...@opensuse.org
+
+- Also ensure we express rpm dependencies correctly
+ this package is not gonna work on systemd < 186.
+
+-------------------------------------------------------------------
+Mon Apr 22 19:32:40 UTC 2013 - crrodrig...@opensuse.org
+
+- Update to version 0.8.8_git201304161248
+- drop plymouth-change-service-name.patch, replaced by
+a sed script that will account for all service files' future changes
+- drop patch plymouth-trace-lines, in upstream now
+- drop plymouth-udevadm-path.patch, generic solution in upstream now.
+- drop ply-sdunitdir.patch likewise.
+- drop plymouth-systemd-in-usr.patch likewise.
+- drop systemd-no-warning.patch, not needed with newer systemd
+- drop plymouth-sd-notforking.patch , not really needed anymore.
+
+
+-------------------------------------------------------------------
Old:
----
ply-sdunitdir.patch
plymouth-0.8.8_git201211022126.tar.xz
plymouth-change-service-name.patch
plymouth-sd-notforking.patch
plymouth-systemd-in-usr.patch
plymouth-trace-lines
plymouth-udevadm-path.patch
systemd-no-warning.patch
New:
----
plymouth-0.8.8_git201304161248.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.lF685g/_old 2013-05-02 11:31:45.000000000 +0200
+++ /var/tmp/diff_new_pack.lF685g/_new 2013-05-02 11:31:45.000000000 +0200
@@ -22,7 +22,7 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
-Version: 0.8.8_git201211022126
+Version: 0.8.8_git201304161248
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0+
@@ -32,27 +32,15 @@
Source1: boot-duration
# PATCH-OPENSUSE -- Support the openSUSE initrd
Patch1: suse-initrd-support
-# PATCH-OPENSUSE -- Add line numbers to tracing output
-Patch2: plymouth-trace-lines
# 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 -- Restore suspend / resume state (needed for suspend package)
Patch5: plymouth-restore-suspend.patch
-# PATCH-OPENSUSE -- Change udevadm path
-Patch7: plymouth-udevadm-path.patch
-# PATCH-OPENSUSE -- Remove tag not understood by systemd v44
-Patch8: systemd-no-warning.patch
# PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin
Patch9: plymouth-dracut-path.patch
Patch10: 0001-Some-greenish-openSUSE-colors.patch
-Patch12: plymouth-sd-notforking.patch
-Patch13: ply-sdunitdir.patch
-# PATCH-OPENSUSE -- systemd-tty-ask-password-agent is in /usr/bin now.
-Patch14: plymouth-systemd-in-usr.patch
-# PATCH-FIX-UPSTREAM plymouth-change-service-name.patch fcrozaŧ@suse.com --
ensure correct service names are used
-Patch15: plymouth-change-service-name.patch
# PATCH-OPENSUSE -- plymouth-correct-runtime-dir.patch tittiatc...@gmail.com
-- make sure the runtime directory is /run and not /var/run
Patch16: plymouth-correct-runtime-dir.patch
BuildRequires: automake
@@ -68,13 +56,13 @@
BuildRequires: pkgconfig(libdrm_nouveau)
BuildRequires: pkgconfig(libdrm_radeon)
BuildRequires: pkgconfig(libkms)
-BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(systemd) >= 186
Requires: %{name}-branding
Requires: gnu-unifont-bitmap-fonts
%ifarch %ix86 x86_64 ppc ppc64
Requires: suspend >= 0.80.20100129.1
%endif
-Requires: systemd >= 44
+Requires: systemd >= 186
Requires(post): plymouth-scripts = %{version}
Requires(post): mkinitrd
Suggests: plymouth-plugin-label
@@ -318,23 +306,13 @@
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%ifarch %ix86 x86_64 ppc ppc64
%patch5 -p1
%endif
-%patch7 -p1
-%patch8 -p1
%patch9 -p0
%patch10 -p1
-%patch12
-%patch13
-# haha, evil condition... :-)
-%if "0%(type -p systemd-tty-ask-password-agent)" ==
"0/usr/bin/systemd-tty-ask-password-agent"
-%patch14 -p1
-%endif
-%patch15 -p1
%patch16 -p1
# replace builddate with patch0date
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
@@ -387,6 +365,7 @@
mkdir -p %{buildroot}/lib/mkinitrd/scripts
install -t %{buildroot}/lib/mkinitrd/scripts \
scripts/{setup,boot}-plymouth*.sh
+find %{buildroot} -type f -name "*.service" -print -exec sed -i -e
's@prefdm.service@display-manager.service@g' -e
's@reboot.service@systemd-reboot.service@g' {} +
%post
if [ ! -e /.buildenv ]; then
++++++ plymouth-0.8.8_git201211022126.tar.xz ->
plymouth-0.8.8_git201304161248.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.8.8_git201211022126/.gitignore
new/plymouth-0.8.8_git201304161248/.gitignore
--- old/plymouth-0.8.8_git201211022126/.gitignore 2012-11-02
22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/.gitignore 2013-04-16
14:48:40.000000000 +0200
@@ -39,3 +39,5 @@
*.string
*.plymouth
*.script.h
+*.service
+*.path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.8.8_git201211022126/configure.ac
new/plymouth-0.8.8_git201304161248/configure.ac
--- old/plymouth-0.8.8_git201211022126/configure.ac 2012-11-02
22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/configure.ac 2013-04-16
14:48:40.000000000 +0200
@@ -6,7 +6,7 @@
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
AC_PROG_AWK
-AC_PROG_CC
+AC_PROG_CC_STDC
AM_PROG_CC_C_O
AC_HEADER_STDC
AC_C_CONST
@@ -16,7 +16,7 @@
AM_MAINTAINER_MODE([enable])
PKG_PROG_PKG_CONFIG
-LT_INIT
+LT_INIT([dlopen disable-static pic-only])
## increment if the interface has additions, changes, removals.
LT_CURRENT=3
@@ -44,6 +44,9 @@
AC_SUBST(PLYMOUTH_CFLAGS)
AC_SUBST(PLYMOUTH_LIBS)
+AC_PATH_PROG([SYSTEMD_ASK_PASSWORD_AGENT], [systemd-tty-ask-password-agent])
+AC_PATH_PROG([UDEVADM], [udevadm])
+
AC_ARG_ENABLE(pango, AS_HELP_STRING([--enable-pango],[enable building with
pango, disabled there is no encryption
prompts]),enable_pango=$enableval,enable_pango=yes)
AM_CONDITIONAL(ENABLE_PANGO, [test "$enable_pango" = yes])
@@ -254,7 +257,7 @@
if test x$enable_systemd_integration = xyes; then
AC_DEFINE(PLY_ENABLE_SYSTEMD_INTEGRATION, 1, [Coordinate boot up with
systemd])
- SYSTEMD_UNIT_DIR=/lib/systemd/system
+ SYSTEMD_UNIT_DIR=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
AC_SUBST(SYSTEMD_UNIT_DIR)
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/scripts/plymouth-generate-initrd.in
new/plymouth-0.8.8_git201304161248/scripts/plymouth-generate-initrd.in
--- old/plymouth-0.8.8_git201211022126/scripts/plymouth-generate-initrd.in
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/scripts/plymouth-generate-initrd.in
2013-04-16 14:48:40.000000000 +0200
@@ -13,11 +13,12 @@
$PLYMOUTH_POPULATE_INITRD -t "$PLYMOUTH_INITRD_DIR"
if [ $? -eq 0 ]; then
+ command -v pigz &>/dev/null && gzip=pigz || gzip=gzip
(cd $PLYMOUTH_INITRD_DIR;
# FIXME: might make sense to add a flag to plymouth-populate-initrd to
# skip these from the start
rm -f lib*/{ld*,libc*,libdl*,libm*,libz*,libpthread*}
- find | cpio -Hnewc -o | gzip -9 > $PLYMOUTH_IMAGE_FILE
+ find | cpio -Hnewc -o | $gzip -9 > $PLYMOUTH_IMAGE_FILE
)
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/scripts/plymouth-populate-initrd.in
new/plymouth-0.8.8_git201304161248/scripts/plymouth-populate-initrd.in
--- old/plymouth-0.8.8_git201211022126/scripts/plymouth-populate-initrd.in
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/scripts/plymouth-populate-initrd.in
2013-04-16 14:48:40.000000000 +0200
@@ -8,6 +8,7 @@
[ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="@PLYMOUTH_DATADIR@"
[ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth
--get-splash-plugin-path)"
[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@PLYMOUTH_LOGO_FILE@"
+[ -n "$PLYMOUTH_THEME_NAME" ] && THEME_OVERRIDE=1
[ -z "$PLYMOUTH_THEME_NAME" ] &&
PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
[ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@"
[ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@"
@@ -388,6 +389,12 @@
exit 1
fi
+if [ $THEME_OVERRIDE ]; then
+ conf=$INITRDDIR/${PLYMOUTH_CONFDIR}/plymouthd.conf
+ echo "modifying plymouthd.conf: Theme=$PLYMOUTH_THEME_NAME" > /dev/stderr
+ sed -i "s/^ *Theme *=.*/# theme modified by
plymouth-populate-initrd\nTheme=$PLYMOUTH_THEME_NAME/" $conf
+fi
+
PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *"
${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth
| sed 's/ModuleName *= *//')
if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
@@ -425,6 +432,7 @@
inst $SYSTEMD_UNIT_DIR/plymouth-halt.service $INITRDDIR
inst
$SYSTEMD_UNIT_DIR/initrd-switch-root.target.wants/plymouth-switch-root.service
$INITRDDIR
+ inst
$SYSTEMD_UNIT_DIR/initrd-switch-root.target.wants/plymouth-start.service
$INITRDDIR
inst $SYSTEMD_UNIT_DIR/sysinit.target.wants/plymouth-start.service
$INITRDDIR
inst $SYSTEMD_UNIT_DIR/multi-user.target.wants/plymouth-quit.service
$INITRDDIR
inst $SYSTEMD_UNIT_DIR/multi-user.target.wants/plymouth-quit-wait.service
$INITRDDIR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/libply/ply-event-loop.c
new/plymouth-0.8.8_git201304161248/src/libply/ply-event-loop.c
--- old/plymouth-0.8.8_git201211022126/src/libply/ply-event-loop.c
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/libply/ply-event-loop.c
2013-04-16 14:48:40.000000000 +0200
@@ -491,7 +491,7 @@
loop = calloc (1, sizeof (ply_event_loop_t));
- loop->epoll_fd = epoll_create (PLY_EVENT_LOOP_NUM_EVENT_HANDLERS);
+ loop->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
loop->wakeup_time = PLY_EVENT_LOOP_NO_TIMED_WAKEUP;
assert (loop->epoll_fd >= 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/libply/ply-key-file.c
new/plymouth-0.8.8_git201304161248/src/libply/ply-key-file.c
--- old/plymouth-0.8.8_git201211022126/src/libply/ply-key-file.c
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/libply/ply-key-file.c
2013-04-16 14:48:40.000000000 +0200
@@ -75,7 +75,7 @@
{
assert (key_file != NULL);
- key_file->fp = fopen (key_file->filename, "r");
+ key_file->fp = fopen (key_file->filename, "re");
if (key_file->fp == NULL)
{
@@ -173,7 +173,7 @@
ply_key_file_entry_t *entry;
char *key;
char *value;
- long offset;
+ off_t offset;
int first_byte;
key = NULL;
@@ -196,13 +196,13 @@
}
ungetc (first_byte, key_file->fp);
- offset = ftell (key_file->fp);
- items_matched = fscanf (key_file->fp, " %a[^= \t\n] = %a[^\n] ", &key,
&value);
+ offset = ftello (key_file->fp);
+ items_matched = fscanf (key_file->fp, " %m[^= \t\n] = %m[^\n] ", &key,
&value);
if (items_matched != 2)
{
if (items_matched == 1)
- fseek (key_file->fp, offset, SEEK_SET);
+ fseeko (key_file->fp, offset, SEEK_SET);
free (key);
free (value);
@@ -254,7 +254,7 @@
ungetc (first_byte, key_file->fp);
group_name = NULL;
- items_matched = fscanf (key_file->fp, " [ %a[^]] ] ", &group_name);
+ items_matched = fscanf (key_file->fp, " [ %m[^]] ] ", &group_name);
if (items_matched <= 0)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/libply/ply-logger.c
new/plymouth-0.8.8_git201304161248/src/libply/ply-logger.c
--- old/plymouth-0.8.8_git201211022126/src/libply/ply-logger.c 2012-11-02
22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/libply/ply-logger.c 2013-04-16
14:48:40.000000000 +0200
@@ -40,7 +40,7 @@
#include "ply-list.h"
#ifndef PLY_LOGGER_OPEN_FLAGS
-#define PLY_LOGGER_OPEN_FLAGS (O_WRONLY | O_TRUNC | O_CREAT | O_NOFOLLOW)
+#define PLY_LOGGER_OPEN_FLAGS (O_WRONLY | O_TRUNC | O_CREAT | O_NOFOLLOW |
O_CLOEXEC)
#endif
#ifndef PLY_LOGGER_MAX_INJECTION_SIZE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/libply/ply-logger.h
new/plymouth-0.8.8_git201304161248/src/libply/ply-logger.h
--- old/plymouth-0.8.8_git201211022126/src/libply/ply-logger.h 2012-11-02
22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/libply/ply-logger.h 2013-04-16
14:48:40.000000000 +0200
@@ -91,8 +91,8 @@
ply_logger_flush (logger);
\
errno = _old_errno;
\
ply_logger_inject (logger,
\
- "[%s] %45.45s:" format "\r\n",
\
- __FILE__, __func__, ##args);
\
+ "[%s:%d] %45.45s:" format "\r\n",
\
+ __FILE__, __LINE__, __func__, ##args);
\
ply_logger_flush (logger);
\
errno = _old_errno;
\
}
\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/libply/ply-progress.c
new/plymouth-0.8.8_git201304161248/src/libply/ply-progress.c
--- old/plymouth-0.8.8_git201211022126/src/libply/ply-progress.c
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/libply/ply-progress.c
2013-04-16 14:48:40.000000000 +0200
@@ -22,6 +22,10 @@
* Charlie Brej <cb...@cs.man.ac.uk>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <assert.h>
#include <errno.h>
#include <math.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/libply/ply-utils.c
new/plymouth-0.8.8_git201304161248/src/libply/ply-utils.c
--- old/plymouth-0.8.8_git201211022126/src/libply/ply-utils.c 2012-11-02
22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/libply/ply-utils.c 2013-04-16
14:48:40.000000000 +0200
@@ -87,27 +87,9 @@
assert (sender_fd != NULL);
assert (receiver_fd != NULL);
- if (pipe (pipe_fds) < 0)
+ if (pipe2 (pipe_fds, O_CLOEXEC) < 0)
return false;
- if (fcntl (pipe_fds[0], F_SETFD, O_NONBLOCK | FD_CLOEXEC) < 0)
- {
- ply_save_errno ();
- close (pipe_fds[0]);
- close (pipe_fds[1]);
- ply_restore_errno ();
- return false;
- }
-
- if (fcntl (pipe_fds[1], F_SETFD, O_NONBLOCK | FD_CLOEXEC) < 0)
- {
- ply_save_errno ();
- close (pipe_fds[0]);
- close (pipe_fds[1]);
- ply_restore_errno ();
- return false;
- }
-
*sender_fd = pipe_fds[1];
*receiver_fd = pipe_fds[0];
@@ -120,20 +102,11 @@
int fd;
const int should_pass_credentials = true;
- fd = socket (PF_UNIX, SOCK_STREAM, 0);
+ fd = socket (PF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
if (fd < 0)
return -1;
- if (fcntl (fd, F_SETFD, O_NONBLOCK | FD_CLOEXEC) < 0)
- {
- ply_save_errno ();
- close (fd);
- ply_restore_errno ();
-
- return -1;
- }
-
if (setsockopt (fd, SOL_SOCKET, SO_PASSCRED,
&should_pass_credentials, sizeof (should_pass_credentials))
< 0)
{
@@ -822,11 +795,12 @@
if (!ply_read (receiver_fd, &byte, sizeof (uint8_t)))
{
+ int read_error = errno;
int status;
if (waitpid (pid, &status, WNOHANG) <= 0)
{
- ply_error ("failed to read status from child immediately after
starting to daemonize");
+ ply_error ("failed to read status from child immediately after
starting to daemonize: %s", strerror (read_error));
}
else if (WIFEXITED (status))
{
@@ -971,7 +945,7 @@
asprintf (&path, "/proc/%ld/stat", (long) pid);
ppid = 0;
- fp = fopen (path, "r");
+ fp = fopen (path, "re");
if (fp == NULL)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/libply-splash-core/ply-text-progress-bar.c
new/plymouth-0.8.8_git201304161248/src/libply-splash-core/ply-text-progress-bar.c
---
old/plymouth-0.8.8_git201211022126/src/libply-splash-core/ply-text-progress-bar.c
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/src/libply-splash-core/ply-text-progress-bar.c
2013-04-16 14:48:40.000000000 +0200
@@ -104,7 +104,7 @@
buf = NULL;
- fd = open (RELEASE_FILE, O_RDONLY);
+ fd = open (RELEASE_FILE, O_RDONLY|O_CLOEXEC);
if (fd == -1)
goto out;
@@ -136,6 +136,8 @@
if (pos2 != NULL)
*pos2 = '\0';
+ else
+ pos2 = pos + strlen(pos) - 1;
if ((*pos == '\"' && pos2[-1] == '\"') ||
(*pos == '\'' && pos2[-1] == '\''))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/libply-splash-graphics/ply-animation.c
new/plymouth-0.8.8_git201304161248/src/libply-splash-graphics/ply-animation.c
---
old/plymouth-0.8.8_git201211022126/src/libply-splash-graphics/ply-animation.c
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/src/libply-splash-graphics/ply-animation.c
2013-04-16 14:48:40.000000000 +0200
@@ -182,14 +182,8 @@
animation->previous_time = animation->now;
animation->now = ply_get_timestamp ();
-#ifdef REAL_TIME_ANIMATION
should_continue = animate_at_time (animation,
animation->now - animation->start_time);
-#else
- static double time = 0.0;
- time += 1.0 / FRAMES_PER_SECOND;
- should_continue = animate_at_time (animation, time);
-#endif
sleep_time = 1.0 / FRAMES_PER_SECOND;
sleep_time = MAX (sleep_time - (ply_get_timestamp () - animation->now),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/libply-splash-graphics/ply-image.c
new/plymouth-0.8.8_git201304161248/src/libply-splash-graphics/ply-image.c
--- old/plymouth-0.8.8_git201211022126/src/libply-splash-graphics/ply-image.c
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/libply-splash-graphics/ply-image.c
2013-04-16 14:48:40.000000000 +0200
@@ -123,7 +123,7 @@
assert (image != NULL);
- fp = fopen (image->filename, "r");
+ fp = fopen (image->filename, "re");
if (fp == NULL)
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/libply-splash-graphics/ply-throbber.c
new/plymouth-0.8.8_git201304161248/src/libply-splash-graphics/ply-throbber.c
---
old/plymouth-0.8.8_git201211022126/src/libply-splash-graphics/ply-throbber.c
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/src/libply-splash-graphics/ply-throbber.c
2013-04-16 14:48:40.000000000 +0200
@@ -178,14 +178,8 @@
bool should_continue;
throbber->now = ply_get_timestamp ();
-#ifdef REAL_TIME_ANIMATION
should_continue = animate_at_time (throbber,
- throbber->now - throbber->start_time);
-#else
- static double time = 0.0;
- time += 1.0 / FRAMES_PER_SECOND;
- should_continue = animate_at_time (throbber, time);
-#endif
+ throbber->now - throbber->start_time);
sleep_time = 1.0 / FRAMES_PER_SECOND;
sleep_time = MAX (sleep_time - (ply_get_timestamp () - throbber->now),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.8.8_git201211022126/src/main.c
new/plymouth-0.8.8_git201304161248/src/main.c
--- old/plymouth-0.8.8_git201211022126/src/main.c 2012-11-02
22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/main.c 2013-04-16
14:48:40.000000000 +0200
@@ -152,6 +152,7 @@
static void toggle_between_splash_and_details (state_t *state);
static void tell_systemd_to_print_details (state_t *state);
static void tell_systemd_to_stop_printing_details (state_t *state);
+static const char * get_cache_file_for_mode (ply_mode_t mode);
static void
on_session_output (state_t *state,
@@ -356,6 +357,7 @@
PLYMOUTH_THEME_PATH "%s/%s.plymouth",
splash_string, splash_string);
free (splash_string);
+ ply_key_file_free (key_file);
}
static void
@@ -588,17 +590,11 @@
on_newroot (state_t *state,
const char *root_dir)
{
- if (state->mode != PLY_MODE_BOOT)
- {
- ply_trace ("new root is only supported in boot mode ");
- return;
- }
-
ply_trace ("new root mounted at \"%s\", switching to it", root_dir);
chdir(root_dir);
chroot(".");
chdir("/");
- ply_progress_load_cache (state->progress, BOOT_DURATION_FILE);
+ ply_progress_load_cache (state->progress, get_cache_file_for_mode
(state->mode));
if (state->boot_splash != NULL)
ply_boot_splash_root_mounted (state->boot_splash);
}
@@ -1966,7 +1962,7 @@
}
ply_trace ("reading file");
- contents_length = read (fd, contents, sizeof (contents));
+ contents_length = read (fd, contents, sizeof (contents) - 1);
if (contents_length <= 0)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/renderers/drm/ply-renderer-generic-driver.c
new/plymouth-0.8.8_git201304161248/src/plugins/renderers/drm/ply-renderer-generic-driver.c
---
old/plymouth-0.8.8_git201211022126/src/plugins/renderers/drm/ply-renderer-generic-driver.c
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/src/plugins/renderers/drm/ply-renderer-generic-driver.c
2013-04-16 14:48:40.000000000 +0200
@@ -71,6 +71,8 @@
{
int device_fd;
ply_hashtable_t *buffers;
+
+ uint32_t requires_explicit_flushing : 1;
};
static bool
@@ -123,7 +125,7 @@
driver = calloc (1, sizeof (ply_renderer_driver_t));
driver->device_fd = device_fd;
-
+ driver->requires_explicit_flushing = true;
driver->buffers = ply_hashtable_new (ply_hashtable_direct_hash,
ply_hashtable_direct_compare);
@@ -330,6 +332,22 @@
buffer = get_buffer_from_id (driver, buffer_id);
assert (buffer != NULL);
+
+ if (driver->requires_explicit_flushing)
+ {
+ struct drm_clip_rect flush_area;
+ int ret;
+
+ flush_area.x1 = 0;
+ flush_area.y1 = 0;
+ flush_area.x2 = buffer->width;
+ flush_area.y2 = buffer->height;
+
+ ret = drmModeDirtyFB (driver->device_fd, buffer->id, &flush_area, 1);
+
+ if (ret == -ENOSYS)
+ driver->requires_explicit_flushing = false;
+ }
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-debug.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-debug.c
--- old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-debug.c
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-debug.c
2013-04-16 14:48:40.000000000 +0200
@@ -19,6 +19,10 @@
*
* Written by: Charlie Brej <cb...@cs.man.ac.uk>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ply-hashtable.h"
#include <stdlib.h>
#include <string.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-execute.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-execute.c
---
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-execute.c
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-execute.c
2013-04-16 14:48:40.000000000 +0200
@@ -19,7 +19,11 @@
*
* Written by: Charlie Brej <cb...@cs.man.ac.uk>
*/
-#define _GNU_SOURCE
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ply-hashtable.h"
#include "ply-list.h"
#include "ply-logger.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-lib-image.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-image.c
---
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-lib-image.c
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-image.c
2013-04-16 14:48:40.000000000 +0200
@@ -19,7 +19,9 @@
*
* Written by: Charlie Brej <cb...@cs.man.ac.uk>
*/
-#define _GNU_SOURCE
+
+#include "config.h"
+
#include "ply-image.h"
#include "ply-label.h"
#include "ply-pixel-buffer.h"
@@ -36,8 +38,6 @@
#include <stdlib.h>
#include <string.h>
-#include "config.h"
-
#include "script-lib-image.script.h"
static void image_free (script_obj_t *obj)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-lib-math.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-math.c
---
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-lib-math.c
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-math.c
2013-04-16 14:48:40.000000000 +0200
@@ -19,7 +19,9 @@
*
* Written by: Charlie Brej <cb...@cs.man.ac.uk>
*/
-#define _GNU_SOURCE
+
+#include "config.h"
+
#include "script.h"
#include "script-parse.h"
#include "script-execute.h"
@@ -31,7 +33,6 @@
#include <string.h>
#include <math.h>
-#include "config.h"
#include "script-lib-math.script.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-lib-plymouth.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-plymouth.c
---
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-lib-plymouth.c
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-plymouth.c
2013-04-16 14:48:40.000000000 +0200
@@ -19,7 +19,9 @@
*
* Written by: Charlie Brej <cb...@cs.man.ac.uk>
*/
-#define _GNU_SOURCE
+
+#include "config.h"
+
#include "ply-boot-splash-plugin.h"
#include "ply-utils.h"
#include "script.h"
@@ -32,8 +34,6 @@
#include <stdlib.h>
#include <string.h>
-#include "config.h"
-
#include "script-lib-plymouth.script.h"
static script_return_t plymouth_set_function (script_state_t *state,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-lib-string.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-string.c
---
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-lib-string.c
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-lib-string.c
2013-04-16 14:48:40.000000000 +0200
@@ -19,7 +19,9 @@
*
* Written by: Charlie Brej <cb...@cs.man.ac.uk>
*/
-#define _GNU_SOURCE
+
+#include "config.h"
+
#include "script.h"
#include "script-parse.h"
#include "script-execute.h"
@@ -31,8 +33,6 @@
#include <stdlib.h>
#include <string.h>
-#include "config.h"
-
#include "script-lib-string.script.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-object.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-object.c
---
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-object.c
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-object.c
2013-04-16 14:48:40.000000000 +0200
@@ -19,7 +19,11 @@
*
* Written by: Charlie Brej <cb...@cs.man.ac.uk>
*/
-#define _GNU_SOURCE
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ply-hashtable.h"
#include "ply-list.h"
#include "ply-bitarray.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-parse.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-parse.c
--- old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-parse.c
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-parse.c
2013-04-16 14:48:40.000000000 +0200
@@ -19,7 +19,11 @@
*
* Written by: Charlie Brej <cb...@cs.man.ac.uk>
*/
-#define _GNU_SOURCE
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ply-hashtable.h"
#include "ply-list.h"
#include "ply-bitarray.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-scan.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-scan.c
--- old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script-scan.c
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script-scan.c
2013-04-16 14:48:40.000000000 +0200
@@ -19,6 +19,10 @@
*
* Written by: Charlie Brej <cb...@cs.man.ac.uk>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
@@ -61,7 +65,7 @@
script_scan_t *script_scan_file (const char *filename)
{
- int fd = open (filename, O_RDONLY);
+ int fd = open (filename, O_RDONLY|O_CLOEXEC);
if (fd < 0) return NULL;
script_scan_t *scan = script_scan_new ();
scan->name = strdup (filename);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script.c
--- old/plymouth-0.8.8_git201211022126/src/plugins/splash/script/script.c
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/plugins/splash/script/script.c
2013-04-16 14:48:40.000000000 +0200
@@ -19,7 +19,11 @@
*
* Written by: Charlie Brej <cb...@cs.man.ac.uk>
*/
-#define _GNU_SOURCE
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ply-hashtable.h"
#include "ply-list.h"
#include "ply-bitarray.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/plugins/splash/throbgress/plugin.c
new/plymouth-0.8.8_git201304161248/src/plugins/splash/throbgress/plugin.c
--- old/plymouth-0.8.8_git201211022126/src/plugins/splash/throbgress/plugin.c
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/plugins/splash/throbgress/plugin.c
2013-04-16 14:48:40.000000000 +0200
@@ -247,6 +247,8 @@
{
ply_list_node_t *node;
+ ply_trace ("pausing views");
+
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -267,6 +269,8 @@
{
ply_list_node_t *node;
+ ply_trace ("unpausing views");
+
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -431,6 +435,8 @@
if (plugin == NULL)
return;
+ ply_trace ("destroying plugin");
+
if (plugin->loop != NULL)
{
ply_event_loop_stop_watching_for_exit (plugin->loop,
(ply_event_loop_exit_handler_t)
@@ -510,6 +516,8 @@
if (plugin->is_animating)
return;
+ ply_trace ("starting animation");
+
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -542,6 +550,9 @@
if (!plugin->is_animating)
return;
+ ply_trace ("stopping animation%s",
+ trigger != NULL? " with trigger" : "");
+
plugin->is_animating = false;
node = ply_list_get_first_node (plugin->views);
@@ -619,6 +630,7 @@
{
view_t *view;
+ ply_trace ("adding pixel display to plugin");
view = view_new (plugin, display);
ply_pixel_display_set_draw_handler (view->display,
@@ -634,6 +646,7 @@
{
ply_list_node_t *node;
+ ply_trace ("removing pixel display from plugin");
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -745,6 +758,7 @@
{
assert (plugin != NULL);
+ ply_trace ("hiding splash");
if (plugin->loop != NULL)
{
stop_animation (plugin, NULL);
@@ -765,6 +779,7 @@
{
ply_list_node_t *node;
+ ply_trace ("showing password prompt");
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -788,6 +803,7 @@
{
ply_list_node_t *node;
+ ply_trace ("showing prompt");
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -807,6 +823,7 @@
static void
on_root_mounted (ply_boot_splash_plugin_t *plugin)
{
+ ply_trace ("root filesystem mounted");
plugin->root_is_mounted = true;
}
@@ -814,8 +831,10 @@
become_idle (ply_boot_splash_plugin_t *plugin,
ply_trigger_t *idle_trigger)
{
+ ply_trace ("deactivation requested");
if (plugin->is_idle)
{
+ ply_trace ("plugin is already idle");
ply_trigger_pull (idle_trigger, NULL);
return;
}
@@ -829,6 +848,7 @@
{
ply_list_node_t *node;
+ ply_trace ("hiding prompt");
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -844,6 +864,7 @@
}
}
+
static void
show_message (ply_boot_splash_plugin_t *plugin,
const char *message)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plymouth-0.8.8_git201211022126/src/ply-boot-server.c
new/plymouth-0.8.8_git201304161248/src/ply-boot-server.c
--- old/plymouth-0.8.8_git201211022126/src/ply-boot-server.c 2012-11-02
22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/ply-boot-server.c 2013-04-16
14:48:40.000000000 +0200
@@ -776,7 +776,7 @@
assert (server != NULL);
- fd = accept (server->socket_fd, NULL, NULL);
+ fd = accept4 (server->socket_fd, NULL, NULL, SOCK_CLOEXEC);
if (fd < 0)
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/src/viewer/plymouth-log-viewer.c
new/plymouth-0.8.8_git201304161248/src/viewer/plymouth-log-viewer.c
--- old/plymouth-0.8.8_git201211022126/src/viewer/plymouth-log-viewer.c
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/src/viewer/plymouth-log-viewer.c
2013-04-16 14:48:40.000000000 +0200
@@ -20,6 +20,10 @@
* Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/systemd-units/Makefile.am
new/plymouth-0.8.8_git201304161248/systemd-units/Makefile.am
--- old/plymouth-0.8.8_git201211022126/systemd-units/Makefile.am
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/systemd-units/Makefile.am
2013-04-16 14:48:40.000000000 +0200
@@ -25,7 +25,8 @@
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants
(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/initrd-switch-root.target.wants && \
- rm -f plymouth-switch-root.service && \
+ rm -f plymouth-start.service plymouth-switch-root.service && \
+ $(LN_S) ../plymouth-start.service && \
$(LN_S) ../plymouth-switch-root.service)
(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants && \
rm -f plymouth-start.service plymouth-read-write.service && \
@@ -51,7 +52,7 @@
uninstall-hook:
rm -f \
(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/initrd-switch-root.target.wants && \
- rm -f plymouth-switch-root.service) \
+ rm -f plymouth-start.service plymouth-switch-root.service) \
(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants && \
rm -f plymouth-start.service plymouth-read-write.service) \
(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants && \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-halt.service.in
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-halt.service.in
--- old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-halt.service.in
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-halt.service.in
2013-04-16 14:48:40.000000000 +0200
@@ -9,3 +9,6 @@
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
Type=forking
+
+[Install]
+WantedBy=halt.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-kexec.service.in
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-kexec.service.in
--- old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-kexec.service.in
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-kexec.service.in
2013-04-16 14:48:40.000000000 +0200
@@ -9,3 +9,6 @@
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
Type=forking
+
+[Install]
+WantedBy=kexec.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-poweroff.service.in
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-poweroff.service.in
---
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-poweroff.service.in
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-poweroff.service.in
2013-04-16 14:48:40.000000000 +0200
@@ -9,3 +9,5 @@
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
Type=forking
+[Install]
+WantedBy=poweroff.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-quit-wait.service.in
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-quit-wait.service.in
---
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-quit-wait.service.in
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-quit-wait.service.in
2013-04-16 14:48:40.000000000 +0200
@@ -6,3 +6,5 @@
ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait
Type=oneshot
TimeoutSec=20
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-quit.service.in
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-quit.service.in
--- old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-quit.service.in
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-quit.service.in
2013-04-16 14:48:40.000000000 +0200
@@ -6,3 +6,5 @@
ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit
Type=oneshot
TimeoutSec=20
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-read-write.service.in
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-read-write.service.in
---
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-read-write.service.in
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-read-write.service.in
2013-04-16 14:48:40.000000000 +0200
@@ -8,3 +8,5 @@
[Service]
ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth update-root-fs --read-write
Type=oneshot
+[Install]
+WantedBy=sysinit.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-reboot.service.in
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-reboot.service.in
--- old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-reboot.service.in
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-reboot.service.in
2013-04-16 14:48:40.000000000 +0200
@@ -9,3 +9,5 @@
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
Type=forking
+[Install]
+WantedBy=reboot.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-start.service.in
new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-start.service.in
--- old/plymouth-0.8.8_git201211022126/systemd-units/plymouth-start.service.in
2012-11-02 22:26:41.000000000 +0100
+++ new/plymouth-0.8.8_git201304161248/systemd-units/plymouth-start.service.in
2013-04-16 14:48:40.000000000 +0200
@@ -1,14 +1,16 @@
[Unit]
Description=Show Plymouth Boot Screen
DefaultDependencies=no
-Wants=systemd-ask-password-plymouth.path
+Wants=systemd-ask-password-plymouth.path systemd-vconsole-setup.service
After=systemd-vconsole-setup.service systemd-udev-trigger.service
Before=systemd-ask-password-plymouth.service
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot
--pid-file=@plymouthruntimedir@/pid --attach-to-session
-ExecStartPost=-/bin/udevadm settle --timeout=30
--exit-if-exists=/sys/class/drm/card0/dev ; /bin/udevadm settle --timeout=30
--exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth
show-splash
+ExecStartPost=-@UDEVADM@ settle --timeout=30
--exit-if-exists=/sys/class/drm/card0/dev ; @UDEVADM@ settle --timeout=30
--exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth
show-splash
Type=forking
KillMode=none
SendSIGKILL=no
+[Install]
+WantedBy=sysinit.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plymouth-0.8.8_git201211022126/systemd-units/systemd-ask-password-plymouth.service.in
new/plymouth-0.8.8_git201304161248/systemd-units/systemd-ask-password-plymouth.service.in
---
old/plymouth-0.8.8_git201211022126/systemd-units/systemd-ask-password-plymouth.service.in
2012-11-02 22:26:41.000000000 +0100
+++
new/plymouth-0.8.8_git201304161248/systemd-units/systemd-ask-password-plymouth.service.in
2013-04-16 14:48:40.000000000 +0200
@@ -9,4 +9,4 @@
ConditionPathExists=/run/plymouth/pid
[Service]
-ExecStart=/bin/systemd-tty-ask-password-agent --watch --plymouth
+ExecStart=@SYSTEMD_ASK_PASSWORD_AGENT@ --watch --plymouth
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
