diff options
| author | Frederic Crozat <fcrozat@mandriva.com> | 2009-03-30 16:54:39 +0000 |
|---|---|---|
| committer | Frederic Crozat <fcrozat@mandriva.com> | 2009-03-30 16:54:39 +0000 |
| commit | 211a322bd1a898cc25723205ed7baef461fd911f (patch) | |
| tree | e8204fa68bde04a739953c2c259c47a78711fc30 | |
| parent | c3e2710be82bbaaa6dedc9b43eab0369cd0cf3be (diff) | |
| download | bootsplash-211a322bd1a898cc25723205ed7baef461fd911f.tar bootsplash-211a322bd1a898cc25723205ed7baef461fd911f.tar.gz bootsplash-211a322bd1a898cc25723205ed7baef461fd911f.tar.bz2 bootsplash-211a322bd1a898cc25723205ed7baef461fd911f.tar.xz bootsplash-211a322bd1a898cc25723205ed7baef461fd911f.zip | |
- Ensure no error is displayed at shutdown when /proc is unmounted
| -rw-r--r-- | scripts/splash.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/splash.sh b/scripts/splash.sh index f87efed..cb269d4 100644 --- a/scripts/splash.sh +++ b/scripts/splash.sh @@ -93,10 +93,10 @@ fi _shutdown="no" _silent="no" -if grep -q silent /proc/cmdline; then +if grep -q silent /proc/cmdline 2>/dev/null ; then if [ "$splash_mode" = "splashy" ]; then _silent="yes" - elif [ "$splash_mode" = "bootsplash" ] && grep -q silent /proc/splash; then + elif [ "$splash_mode" = "bootsplash" ] && grep -q silent /proc/splash 2>/dev/null ; then _silent="yes" fi fi @@ -132,7 +132,7 @@ if [ "$1" == "stop" -a $_shutdown == "no" ]; then fi test -z "$progress" -a -z "$nbservices" && exit 0 -grep -vq "splash=silent" /proc/cmdline && exit 0 +grep -vq "splash=silent" /proc/cmdline 2>/dev/null && exit 0 if [ "$previous" == "3" -o "$previous" == "5" ] ; then if [ "$runlevel" = "3" -o "$runlevel" == "5" ] ; then |