Add plymouth-start.path unit to wait for graphic devices

5 files changed, 29 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4b49fa6119af..fa1c03e91497 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = plymouth
 	pkgdesc = A graphical boot splash screen with kernel mode-setting support
 	pkgver = 0.9.2
-	pkgrel = 6
+	pkgrel = 7
 	url = http://www.freedesktop.org/wiki/Software/Plymouth/
 	arch = i686
 	arch = x86_64
@@ -26,6 +26,7 @@ pkgbase = plymouth
 	source = lightdm-plymouth.service
 	source = slim-plymouth.service
 	source = plymouth-start.service
+	source = plymouth-start.path
 	source = plymouth.initcpio_hook
 	source = plymouth.initcpio_install
 	source = plymouth-quit.service.in.patch
@@ -34,15 +35,16 @@ pkgbase = plymouth
 	md5sums = ff420994deb7ea203df678df92e7ab7d
 	md5sums = 65fa2763d5c9bb9f80973ea5e6e3db3e
 	md5sums = fbdd5d04e3089a214b9056357434df86
-	md5sums = 4b034892158f90b91987619d14330087
+	md5sums = bc7a9d3deadd51f85fdd60700aec820f
 	md5sums = c36da17cb580ff901960e73d56a7d88c
 	md5sums = dcacff05835053242f52b9e375248ec3
 	md5sums = 22130f7e6b20d2a43dbed924de75180b
 	md5sums = 870ea3e63c6989e2badf79d1fbafa914
 	md5sums = 178129ba2d662ce089f9cdfbec7816da
 	md5sums = 78340207f7391c682601b1b36baed14d
+	md5sums = 672ad913e2383483bcb4599a0a6bee48
 	md5sums = 32f04fdbd1eb94ade30d1e63fdcdd9b5
-	md5sums = e64e8d0489fb3b03fa2b42e2aa60982e
+	md5sums = bc571ec7ae62b7ecd33606f6fd160671
 	md5sums = 165a39dbedcc6e123c8ca05d5b4b2e25
 	md5sums = f79edbbb30c71b0dbcd102c7dd31660b
 	md5sums = 0357775c16b5f90f1af485e6a4c80a9e
diff --git a/PKGBUILD b/PKGBUILD
index adbe35364bbb..44f5d70d1e09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 #
-# Maintainer: Damian01w <damian01w@gmail.com>
-# Maintainer: Padfoot <padfoot@exemail.com.au>
+# Maintainer: Sebastian Lau <lauseb644@gmail.com>
+# Contributor Damian01w <damian01w@gmail.com>
+# Contributor: Padfoot <padfoot@exemail.com.au>
 #
 
 pkgname=plymouth
 pkgver=0.9.2
-pkgrel=6
+pkgrel=7
 pkgdesc="A graphical boot splash screen with kernel mode-setting support"
 url="http://www.freedesktop.org/wiki/Software/Plymouth/"
 
@@ -32,6 +33,7 @@ source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pk
 	'lightdm-plymouth.service'
 	'slim-plymouth.service'
 	'plymouth-start.service'
+	'plymouth-start.path'
 	'plymouth.initcpio_hook'
 	'plymouth.initcpio_install'
 	'plymouth-quit.service.in.patch'
@@ -41,15 +43,16 @@ source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pk
 md5sums=('ff420994deb7ea203df678df92e7ab7d'
          '65fa2763d5c9bb9f80973ea5e6e3db3e'
          'fbdd5d04e3089a214b9056357434df86'
-         '4b034892158f90b91987619d14330087'
+         'bc7a9d3deadd51f85fdd60700aec820f'
          'c36da17cb580ff901960e73d56a7d88c'
          'dcacff05835053242f52b9e375248ec3'
          '22130f7e6b20d2a43dbed924de75180b'
          '870ea3e63c6989e2badf79d1fbafa914'
          '178129ba2d662ce089f9cdfbec7816da'
          '78340207f7391c682601b1b36baed14d'
+         '672ad913e2383483bcb4599a0a6bee48'
          '32f04fdbd1eb94ade30d1e63fdcdd9b5'
-         'e64e8d0489fb3b03fa2b42e2aa60982e'
+         'bc571ec7ae62b7ecd33606f6fd160671'
          '165a39dbedcc6e123c8ca05d5b4b2e25'
          'f79edbbb30c71b0dbcd102c7dd31660b'
          '0357775c16b5f90f1af485e6a4c80a9e')
@@ -104,6 +107,7 @@ package() {
   done
 
   install -Dm644 "$srcdir/plymouth-start.service" "$pkgdir/usr/lib/systemd/system/plymouth-start.service"
-  cp "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
+  install -Dm644 "$srcdir/plymouth-start.path" "$pkgdir/usr/lib/systemd/system/plymouth-start.path"
+  install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
 }
 
diff --git a/plymouth-start.path b/plymouth-start.path
new file mode 100644
index 000000000000..6a8c957a0958
--- /dev/null
+++ b/plymouth-start.path
@@ -0,0 +1,10 @@
+[Unit]
+Description=Automatically Start Plymouth Boot Screen
+
+[Path]
+PathExistsGlob=/sys/class/graphics/fb*/device/drm/
+Unit=plymouth-start.service
+
+[Install]
+WantedBy=sysinit.target
+
diff --git a/plymouth.encrypt_install b/plymouth.encrypt_install
index 025b152c31e9..f9b7b2f27b3a 100644
--- a/plymouth.encrypt_install
+++ b/plymouth.encrypt_install
@@ -35,7 +35,8 @@ build() {
         plymouth-read-write.service \
         plymouth-reboot.service \
         plymouth-start.service \
-        plymouth-switch-root.service
+        plymouth-switch-root.service \
+	plymouth-start.path
 
 
     add_runscript
diff --git a/plymouth.initcpio_install b/plymouth.initcpio_install
index e2d61c454747..d1c42b8de039 100644
--- a/plymouth.initcpio_install
+++ b/plymouth.initcpio_install
@@ -60,7 +60,8 @@ build() {
 		plymouth-read-write.service \
 		plymouth-reboot.service \
 		plymouth-start.service \
-		plymouth-switch-root.service
+		plymouth-switch-root.service \
+		plymouth-start.path
 
 	add_runscript
 }