diff options
| author | Michael Janczyk | 2008-09-16 22:01:05 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2008-09-16 22:01:05 +0200 |
| commit | 0603a3fc80804ed9c267110ad8434ef4f60c777d (patch) | |
| tree | 02fac5673216b845d57dd87f25721cb01512af30 | |
| parent | * lost change due merge .. (diff) | |
| download | core-0603a3fc80804ed9c267110ad8434ef4f60c777d.tar.gz core-0603a3fc80804ed9c267110ad8434ef4f60c777d.tar.xz core-0603a3fc80804ed9c267110ad8434ef4f60c777d.zip | |
changed regexp checking, since quiet can be at the beginning or the end of the line
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2230 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh index 657ae1e4..e3e56e99 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh @@ -1,7 +1,8 @@ # splashy depends on /proc/fb with VESA # only activate with kernel option quiet and no debuglevel if grep -E "(VESA|VGA)" /proc/fb > /dev/null 2>&1 \ - && grep -qi " quiet " /proc/cmdline > /dev/null 2>&1 \ + && grep -qie " quiet " -qie "^quiet " -qie " quiet$" /proc/cmdline \ + > /dev/null 2>&1 \ && [ $DEBUGLEVEL -eq 0 ] \ && [ -e /bin/splashy ] ; then export no_bootsplash=0 |