systemd/patches/systemd-185-remove-plymouth-files.patch

   1 From 26cbf29c52a36b6ad9d1ccc16d8f7adccefeddca Mon Sep 17 00:00:00 2001
   2 From: Kay Sievers <kay@vrfy.org>
   3 Date: Thu, 07 Jun 2012 17:27:17 +0000
   4 Subject: delete plymouth units; moved to plymouth
   5
   6 ---
   7 diff --git a/Makefile.am b/Makefile.am
   8 index 6cc352a..f45fa27 100644
   9 --- a/Makefile.am
  10 +++ b/Makefile.am
  11 @@ -425,25 +425,6 @@ systemgenerator_PROGRAMS += \
  12         systemd-rc-local-generator
  13  endif
  14
  15 -if HAVE_PLYMOUTH
  16 -dist_systemunit_DATA += \
  17 -       units/plymouth-start.service \
  18 -       units/plymouth-read-write.service \
  19 -       units/plymouth-quit.service \
  20 -       units/plymouth-quit-wait.service \
  21 -       units/plymouth-reboot.service \
  22 -       units/plymouth-kexec.service \
  23 -       units/plymouth-poweroff.service \
  24 -       units/plymouth-halt.service \
  25 -       units/systemd-ask-password-plymouth.path
  26 -
  27 -nodist_systemunit_DATA += \
  28 -       units/systemd-ask-password-plymouth.service
  29 -
  30 -EXTRA_DIST += \
  31 -       units/systemd-ask-password-plymouth.service.in
  32 -endif
  33 -
  34  dist_doc_DATA = \
  35         README \
  36         NEWS \
  37 @@ -3249,33 +3230,6 @@ systemd-install-data-hook:
  38         ( cd $(DESTDIR)$(dbussessionservicedir) && \
  39                 rm -f org.freedesktop.systemd1.service && \
  40                 $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
  41 -if HAVE_PLYMOUTH
  42 -       $(MKDIR_P) -m 0755 \
  43 -               $(DESTDIR)$(systemunitdir)/reboot.target.wants \
  44 -               $(DESTDIR)$(systemunitdir)/kexec.target.wants \
  45 -               $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
  46 -               $(DESTDIR)$(systemunitdir)/halt.target.wants
  47 -       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
  48 -               rm -f plymouth-start.service plymouth-read-write.service && \
  49 -               $(LN_S) ../plymouth-start.service plymouth-start.service && \
  50 -               $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
  51 -       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
  52 -               rm -f plymouth-quit.service plymouth-quit-wait.service && \
  53 -               $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
  54 -               $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
  55 -       ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
  56 -               rm -f plymouth-reboot.service && \
  57 -               $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
  58 -       ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
  59 -               rm -f plymouth-kexec.service && \
  60 -               $(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
  61 -       ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
  62 -               rm -f plymouth-poweroff.service && \
  63 -               $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
  64 -       ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
  65 -               rm -f plymouth-halt.service && \
  66 -               $(LN_S) ../plymouth-halt.service plymouth-halt.service )
  67 -endif
  68  if TARGET_MEEGO
  69         $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
  70         ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
  71 diff --git a/README b/README
  72 index d922204..d23a3d6 100644
  73 --- a/README
  74 +++ b/README
  75 @@ -60,7 +60,6 @@ REQUIREMENTS:
  76
  77          util-linux > v2.18 (requires fsck -l, agetty -s)
  78          sulogin (from sysvinit-tools, optional but recommended)
  79 -        plymouth (optional)
  80          dracut (optional)
  81
  82          When systemd-hostnamed is used it is strongly recommended to
  83 diff --git a/configure.ac b/configure.ac
  84 index 59892cb..70f3e96 100644
  85 --- a/configure.ac
  86 +++ b/configure.ac
  87 @@ -519,20 +519,17 @@ SYSTEM_SYSVINIT_PATH=/etc/init.d
  88  SYSTEM_SYSVRCND_PATH=/etc/rc.d
  89
  90  M4_DEFINES=
  91 -have_plymouth=no
  92
  93  case $with_distro in
  94          fedora)
  95                  SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
  96                  AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL])
  97                  M4_DEFINES=-DTARGET_FEDORA=1
  98 -                have_plymouth=yes
  99                  ;;
 100          opensuse|suse)
 101                  SYSTEM_SYSVRCND_PATH=/etc/init.d
 102                  AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE])
 103                  M4_DEFINES=-DTARGET_SUSE=1
 104 -                have_plymouth=yes
 105                  ;;
 106          debian)
 107                  SYSTEM_SYSVRCND_PATH=/etc
 108 @@ -565,19 +562,16 @@ case $with_distro in
 109                  SYSTEM_SYSVINIT_PATH=/etc/rc.d
 110                  AC_DEFINE(TARGET_FRUGALWARE, [], [Target is Frugalware])
 111                  M4_DEFINES=-DTARGET_FRUGALWARE=1
 112 -                have_plymouth=yes
 113                  ;;
 114          altlinux)
 115                  SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
 116                  AC_DEFINE(TARGET_ALTLINUX, [], [Target is ALTLinux])
 117                  M4_DEFINES=-DTARGET_ALTLINUX=1
 118 -                have_plymouth=yes
 119                  ;;
 120          mandriva)
 121                  SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
 122                  AC_DEFINE(TARGET_MANDRIVA, [], [Target is Mandriva])
 123                  M4_DEFINES=-DTARGET_MANDRIVA=1
 124 -                have_plymouth=yes
 125                  ;;
 126          meego)
 127                  SYSTEM_SYSVINIT_PATH=
 128 @@ -594,7 +588,6 @@ case $with_distro in
 129                  SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
 130                  AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia])
 131                  M4_DISTRO_FLAG=-DTARGET_MAGEIA=1
 132 -                have_plymouth=yes
 133                  ;;
 134          other)
 135                  ;;
 136 @@ -635,11 +628,6 @@ AC_ARG_WITH([tty-gid],
 137          [AC_DEFINE_UNQUOTED(TTY_GID, [$withval], [GID of the 'tty' group])],
 138          [])
 139
 140 -AC_ARG_ENABLE(plymouth, AS_HELP_STRING([--enable-plymouth], [enable plymouth support]))
 141 -if test -n "$enable_plymouth"; then
 142 -        have_plymouth="$enable_plymouth"
 143 -fi
 144 -
 145  AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
 146  AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
 147  AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
 148 @@ -655,7 +643,6 @@ AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego)
 149  AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom)
 150  AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia)
 151
 152 -AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes")
 153  AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes")
 154
 155  AC_ARG_WITH([dbuspolicydir],
 156 @@ -747,7 +734,6 @@ AC_MSG_RESULT([
 157          timedated:               ${have_timedated}
 158          localed:                 ${have_localed}
 159          coredump:                ${have_coredump}
 160 -        plymouth:                ${have_plymouth}
 161          firmware path:           ${FIRMWARE_PATH}
 162          usb.ids:                 ${USB_DATABASE}
 163          pci.ids:                 ${PCI_DATABASE}
 164 diff --git a/units/.gitignore b/units/.gitignore
 165 index dc5e1d4..eb2516d 100644
 166 --- a/units/.gitignore
 167 +++ b/units/.gitignore
 168 @@ -11,7 +11,6 @@ console-shell.service
 169  systemd-sysctl.service
 170  systemd-ask-password-console.service
 171  rescue.service
 172 -systemd-ask-password-plymouth.service
 173  systemd-ask-password-wall.service
 174  quotacheck.service
 175  fsck@.service
 176 diff --git a/units/plymouth-halt.service b/units/plymouth-halt.service
 177 deleted file mode 100644
 178 index 5dca3cc..0000000
 179 --- a/units/plymouth-halt.service
 180 +++ b/dev/null
 181 @@ -1,18 +0,0 @@
 182 -#  This file is part of systemd.
 183 -#
 184 -#  systemd is free software; you can redistribute it and/or modify it
 185 -#  under the terms of the GNU Lesser General Public License as published by
 186 -#  the Free Software Foundation; either version 2.1 of the License, or
 187 -#  (at your option) any later version.
 188 -
 189 -[Unit]
 190 -Description=Show Plymouth Halt Screen
 191 -After=getty@tty1.service prefdm.service plymouth-start.service
 192 -Before=halt.service
 193 -DefaultDependencies=no
 194 -ConditionKernelCommandLine=!plymouth.enable=0
 195 -
 196 -[Service]
 197 -ExecStart=/sbin/plymouthd --mode=shutdown
 198 -ExecStartPost=-/bin/plymouth --show-splash
 199 -Type=forking
 200 diff --git a/units/plymouth-kexec.service b/units/plymouth-kexec.service
 201 deleted file mode 100644
 202 index 8c36b75..0000000
 203 --- a/units/plymouth-kexec.service
 204 +++ b/dev/null
 205 @@ -1,18 +0,0 @@
 206 -#  This file is part of systemd.
 207 -#
 208 -#  systemd is free software; you can redistribute it and/or modify it
 209 -#  under the terms of the GNU Lesser General Public License as published by
 210 -#  the Free Software Foundation; either version 2.1 of the License, or
 211 -#  (at your option) any later version.
 212 -
 213 -[Unit]
 214 -Description=Show Plymouth Reboot with kexec Screen
 215 -After=getty@tty1.service prefdm.service plymouth-start.service
 216 -Before=kexec.service
 217 -DefaultDependencies=no
 218 -ConditionKernelCommandLine=!plymouth.enable=0
 219 -
 220 -[Service]
 221 -ExecStart=/sbin/plymouthd --mode=shutdown
 222 -ExecStartPost=-/bin/plymouth --show-splash
 223 -Type=forking
 224 diff --git a/units/plymouth-poweroff.service b/units/plymouth-poweroff.service
 225 deleted file mode 100644
 226 index e69033a..0000000
 227 --- a/units/plymouth-poweroff.service
 228 +++ b/dev/null
 229 @@ -1,18 +0,0 @@
 230 -#  This file is part of systemd.
 231 -#
 232 -#  systemd is free software; you can redistribute it and/or modify it
 233 -#  under the terms of the GNU Lesser General Public License as published by
 234 -#  the Free Software Foundation; either version 2.1 of the License, or
 235 -#  (at your option) any later version.
 236 -
 237 -[Unit]
 238 -Description=Show Plymouth Power Off Screen
 239 -After=getty@tty1.service prefdm.service plymouth-start.service
 240 -Before=poweroff.service
 241 -DefaultDependencies=no
 242 -ConditionKernelCommandLine=!plymouth.enable=0
 243 -
 244 -[Service]
 245 -ExecStart=/sbin/plymouthd --mode=shutdown
 246 -ExecStartPost=-/bin/plymouth --show-splash
 247 -Type=forking
 248 diff --git a/units/plymouth-quit-wait.service b/units/plymouth-quit-wait.service
 249 deleted file mode 100644
 250 index 3801c88..0000000
 251 --- a/units/plymouth-quit-wait.service
 252 +++ b/dev/null
 253 @@ -1,15 +0,0 @@
 254 -#  This file is part of systemd.
 255 -#
 256 -#  systemd is free software; you can redistribute it and/or modify it
 257 -#  under the terms of the GNU Lesser General Public License as published by
 258 -#  the Free Software Foundation; either version 2.1 of the License, or
 259 -#  (at your option) any later version.
 260 -
 261 -[Unit]
 262 -Description=Wait for Plymouth Boot Screen to Quit
 263 -After=rc-local.service plymouth-start.service systemd-user-sessions.service
 264 -
 265 -[Service]
 266 -ExecStart=-/bin/plymouth --wait
 267 -Type=oneshot
 268 -TimeoutSec=20
 269 diff --git a/units/plymouth-quit.service b/units/plymouth-quit.service
 270 deleted file mode 100644
 271 index 8b4860f..0000000
 272 --- a/units/plymouth-quit.service
 273 +++ b/dev/null
 274 @@ -1,15 +0,0 @@
 275 -#  This file is part of systemd.
 276 -#
 277 -#  systemd is free software; you can redistribute it and/or modify it
 278 -#  under the terms of the GNU Lesser General Public License as published by
 279 -#  the Free Software Foundation; either version 2.1 of the License, or
 280 -#  (at your option) any later version.
 281 -
 282 -[Unit]
 283 -Description=Terminate Plymouth Boot Screen
 284 -After=rc-local.service plymouth-start.service systemd-user-sessions.service
 285 -
 286 -[Service]
 287 -ExecStart=-/bin/plymouth quit
 288 -Type=oneshot
 289 -TimeoutSec=20
 290 diff --git a/units/plymouth-read-write.service b/units/plymouth-read-write.service
 291 deleted file mode 100644
 292 index e8ef447..0000000
 293 --- a/units/plymouth-read-write.service
 294 +++ b/dev/null
 295 @@ -1,16 +0,0 @@
 296 -#  This file is part of systemd.
 297 -#
 298 -#  systemd is free software; you can redistribute it and/or modify it
 299 -#  under the terms of the GNU Lesser General Public License as published by
 300 -#  the Free Software Foundation; either version 2.1 of the License, or
 301 -#  (at your option) any later version.
 302 -
 303 -[Unit]
 304 -Description=Tell Plymouth To Write Out Runtime Data
 305 -DefaultDependencies=no
 306 -After=local-fs.target
 307 -Before=sysinit.target
 308 -
 309 -[Service]
 310 -ExecStart=-/bin/plymouth update-root-fs --read-write
 311 -Type=oneshot
 312 diff --git a/units/plymouth-reboot.service b/units/plymouth-reboot.service
 313 deleted file mode 100644
 314 index 5c52bc6..0000000
 315 --- a/units/plymouth-reboot.service
 316 +++ b/dev/null
 317 @@ -1,18 +0,0 @@
 318 -#  This file is part of systemd.
 319 -#
 320 -#  systemd is free software; you can redistribute it and/or modify it
 321 -#  under the terms of the GNU Lesser General Public License as published by
 322 -#  the Free Software Foundation; either version 2.1 of the License, or
 323 -#  (at your option) any later version.
 324 -
 325 -[Unit]
 326 -Description=Show Plymouth Reboot Screen
 327 -After=getty@tty1.service prefdm.service plymouth-start.service
 328 -Before=reboot.service
 329 -DefaultDependencies=no
 330 -ConditionKernelCommandLine=!plymouth.enable=0
 331 -
 332 -[Service]
 333 -ExecStart=/sbin/plymouthd --mode=shutdown
 334 -ExecStartPost=-/bin/plymouth --show-splash
 335 -Type=forking
 336 diff --git a/units/plymouth-start.service b/units/plymouth-start.service
 337 deleted file mode 100644
 338 index 2e358aa..0000000
 339 --- a/units/plymouth-start.service
 340 +++ b/dev/null
 341 @@ -1,22 +0,0 @@
 342 -#  This file is part of systemd.
 343 -#
 344 -#  systemd is free software; you can redistribute it and/or modify it
 345 -#  under the terms of the GNU Lesser General Public License as published by
 346 -#  the Free Software Foundation; either version 2.1 of the License, or
 347 -#  (at your option) any later version.
 348 -
 349 -[Unit]
 350 -Description=Show Plymouth Boot Screen
 351 -DefaultDependencies=no
 352 -Wants=systemd-ask-password-plymouth.path
 353 -After=systemd-vconsole-setup.service systemd-udev-settle.service
 354 -Before=systemd-ask-password-plymouth.service
 355 -
 356 -# Dracut informs us with this flag file if plymouth is already running
 357 -ConditionPathExists=!/run/plymouth/pid
 358 -ConditionKernelCommandLine=!plymouth.enable=0
 359 -
 360 -[Service]
 361 -ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid
 362 -ExecStartPost=-/bin/plymouth --show-splash
 363 -Type=forking
 364 diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
 365 deleted file mode 100644
 366 index 9320b4a..0000000
 367 --- a/units/systemd-ask-password-plymouth.path
 368 +++ b/dev/null
 369 @@ -1,20 +0,0 @@
 370 -#  This file is part of systemd.
 371 -#
 372 -#  systemd is free software; you can redistribute it and/or modify it
 373 -#  under the terms of the GNU Lesser General Public License as published by
 374 -#  the Free Software Foundation; either version 2.1 of the License, or
 375 -#  (at your option) any later version.
 376 -
 377 -[Unit]
 378 -Description=Forward Password Requests to Plymouth Directory Watch
 379 -Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
 380 -DefaultDependencies=no
 381 -Conflicts=shutdown.target
 382 -After=plymouth-start.service
 383 -Before=basic.target shutdown.target
 384 -ConditionKernelCommandLine=!plymouth.enable=0
 385 -ConditionPathExists=/run/plymouth/pid
 386 -
 387 -[Path]
 388 -DirectoryNotEmpty=/run/systemd/ask-password
 389 -MakeDirectory=yes
 390 diff --git a/units/systemd-ask-password-plymouth.service.in b/units/systemd-ask-password-plymouth.service.in
 391 deleted file mode 100644
 392 index ea80bbd..0000000
 393 --- a/units/systemd-ask-password-plymouth.service.in
 394 +++ b/dev/null
 395 @@ -1,19 +0,0 @@
 396 -#  This file is part of systemd.
 397 -#
 398 -#  systemd is free software; you can redistribute it and/or modify it
 399 -#  under the terms of the GNU Lesser General Public License as published by
 400 -#  the Free Software Foundation; either version 2.1 of the License, or
 401 -#  (at your option) any later version.
 402 -
 403 -[Unit]
 404 -Description=Forward Password Requests to Plymouth
 405 -Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
 406 -DefaultDependencies=no
 407 -Conflicts=shutdown.target
 408 -After=plymouth-start.service
 409 -Before=shutdown.target
 410 -ConditionKernelCommandLine=!plymouth.enable=0
 411 -ConditionPathExists=/run/plymouth/pid
 412 -
 413 -[Service]
 414 -ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth
 415 --
 416 cgit v0.9.0.2-2-gbebe