Commit 68259e09 authored by Ray Strode's avatar Ray Strode

systemd: strip plymouth bits from unit file if built --without-plymouth

Otherwise, if you have plymouth, but build --without-plymouth then boot
will screw up

https://bugzilla.gnome.org/show_bug.cgi?id=740802
parent 0950c624
......@@ -980,15 +980,18 @@ else
use_plymouth="$with_plymouth"
fi
PLYMOUTH_QUIT_SERVICE=""
if test "x$use_plymouth" != "xno" ; then
if test "x$have_plymouth" = "xno"; then
AC_MSG_ERROR([Plymouth support explicitly required, but plymouth not found])
fi
AC_DEFINE(WITH_PLYMOUTH, 1, [Define to enable plymouth support])
PLYMOUTH_QUIT_SERVICE="plymouth-quit.service"
fi
AC_SUBST(PLYMOUTH_CFLAGS)
AC_SUBST(PLYMOUTH_LIBS)
AC_SUBST(PLYMOUTH_QUIT_SERVICE)
dnl ---------------------------------------------------------------------------
dnl - Check for D-Bus
......
......@@ -197,6 +197,8 @@ gdm.service: $(srcdir)/gdm.service.in
$(AM_V_GEN)sed \
-e 's,[@]sbindir[@],$(sbindir),g' \
-e 's,[@]GDM_INITIAL_VT[@],$(GDM_INITIAL_VT),g' \
-e 's,[@]PLYMOUTH_QUIT_SERVICE[@],$(PLYMOUTH_QUIT_SERVICE),g' \
-e 's, *$$,,g' \
< $< > $@
systemdsystemunit += gdm.service
CLEANFILES += gdm.service
......
[Unit]
Description=GNOME Display Manager
Conflicts=getty@tty@GDM_INITIAL_VT@.service plymouth-quit.service
After=systemd-user-sessions.service getty@tty@GDM_INITIAL_VT@.service plymouth-quit.service
Conflicts=getty@tty@GDM_INITIAL_VT@.service @PLYMOUTH_QUIT_SERVICE@
After=systemd-user-sessions.service getty@tty@GDM_INITIAL_VT@.service @PLYMOUTH_QUIT_SERVICE@
[Service]
ExecStart=@sbindir@/gdm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment