]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
Ship a gdm autostart file with viewer
authorRay Strode <rstrode@redhat.com>
Wed, 13 Aug 2008 03:56:00 +0000 (23:56 -0400)
committerRay Strode <rstrode@redhat.com>
Wed, 13 Aug 2008 03:56:00 +0000 (23:56 -0400)
This way when there is an error the user can see it
at the login screen.

configure.ac
src/viewer/Makefile.am
src/viewer/plymouth-log-viewer.desktop [new file with mode: 0644]

index da4d8b93482cdb93a3093143ecc9dedd85c6a46a..4436dc20ffde37e3723ec4d7781440b248d66846 100644 (file)
@@ -60,6 +60,10 @@ AC_ARG_WITH(boot-entry, AS_HELP_STRING([--with-boot-entry],[create initrd and gr
 
 AM_CONDITIONAL(ADD_BOOT_ENTRY,  [test "$with_boot_entry" = yes])
 
+AC_ARG_WITH(gdm-autostart-file, AS_HELP_STRING([--with-gdm-autostart-file],[start log viewer from gdm on boot errors]),with_gdm_autostart_file=$withval,with_gdm_autostart_file=yes)
+
+AM_CONDITIONAL(START_FROM_GDM,  [test "$with_gdm_autostart_file" = yes])
+
 AC_ARG_WITH(logo, AC_HELP_STRING([--with-logo], [logo used by boot splash plugins]),logofile=${withval},logofile=$datadir/plymouth/bizcom.png)
 AC_SUBST(logofile)
 
index 333a4aa93688f09588db35c436bda244d4725201..1e6529800737abc80d0cf4bfdb6928e8e6444dda 100644 (file)
@@ -1,4 +1,5 @@
 SUBDIRS = .
+EXTRA_DIST=
 
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)
@@ -9,4 +10,10 @@ plymouth_log_viewer_CFLAGS = $(GTK_CFLAGS) -DPLYMOUTH_LOG_DIRECTORY=\"$(localsta
 plymouth_log_viewer_LDADD = $(GTK_LIBS)
 plymouth_log_viewer_SOURCES = $(srcdir)/plymouth-log-viewer.c
 
+if START_FROM_GDM
+gdmautostartdir = $(datadir)/gdm/autostart/LoginWindow
+gdmautostart_DATA = plymouth-log-viewer.desktop
+EXTRA_DIST += plymouth-log-viewer.desktop
+endif
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/viewer/plymouth-log-viewer.desktop b/src/viewer/plymouth-log-viewer.desktop
new file mode 100644 (file)
index 0000000..d157d19
--- /dev/null
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Boot messages
+Comment=Boot messages
+Exec=plymouth-log-viewer --icon
+Terminal=false
+Type=Application
+Categories=
+OnlyShowIn=GNOME;XFCE;