diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2009-02-23 14:19:34 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2009-02-23 14:32:05 -0300 |
| commit | 0ba9afbe37a6ffaaefae3d37c79cb921f60317a2 (patch) | |
| tree | a2989722680e94593559546ed560424d2a1fab80 | |
| parent | 0b7903ed229c1bb2fe93e4253c7dfdeb19f660b2 (diff) | |
psplash: improve how to detect boot param to avoid the psplash starting
It was done using a looping through cmdline contents but it failed
depending on params order; using a grep makes it works more reliably.
| -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 \ |