diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-02-23 18:57:57 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-02-23 18:57:57 +0100 |
| commit | e1dd20e04f1a09561b20ea959a27a24d3a82c506 (patch) | |
| tree | 0edf44a2f9cf08b0cd4fbbb0a960645edd44650c /packages/psplash | |
| parent | f2092fad1832d04356879acfc7c33e820a1313cb (diff) | |
| parent | 3d377399ab4ac700866b75d5229bd78ce72500fb (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/psplash')
| -rw-r--r-- | packages/psplash/files/psplash-init | 12 | ||||
| -rw-r--r-- | packages/psplash/psplash_svn.bb | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/packages/psplash/files/psplash-init b/packages/psplash/files/psplash-init index 7796a79064..a4fb1dc7d1 100644 --- a/packages/psplash/files/psplash-init +++ b/packages/psplash/files/psplash-init @@ -1,13 +1,9 @@ #!/bin/sh -for x in $(cat /proc/cmdline); do - case $x in - psplash=false) - echo "Boot splashscreen disabled" - exit 0; - ;; - esac -done +if grep -qE '\s?psplash=false\s?' /proc/cmdline; then + echo "Boot splashscreen disabled" + exit 0; +fi . /etc/init.d/functions . /etc/default/psplash diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb index e7cbda5641..f471396843 100644 --- a/packages/psplash/psplash_svn.bb +++ b/packages/psplash/psplash_svn.bb @@ -3,7 +3,7 @@ require psplash-ua.inc ALTERNATIVE_PRIORITY = "10" -PR = "r17" +PR = "r18" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ file://psplash-hand-img.h \ |