aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2009-06-18 10:45:28 -0400
committerBill Nottingham <notting@redhat.com>2009-06-18 10:46:45 -0400
commitf54aa488c667ad00098b47ede9bc15ff7451524d (patch)
tree7f2b64b5d04fc18c447a6b17ec7697986f74b4d9
parentcf99b501efa7f4f6dbeedcff2e5dd1375fec0357 (diff)
downloadinitscripts-f54aa488c667ad00098b47ede9bc15ff7451524d.tar
initscripts-f54aa488c667ad00098b47ede9bc15ff7451524d.tar.gz
initscripts-f54aa488c667ad00098b47ede9bc15ff7451524d.tar.bz2
initscripts-f54aa488c667ad00098b47ede9bc15ff7451524d.tar.xz
initscripts-f54aa488c667ad00098b47ede9bc15ff7451524d.zip
Redirect bash errors on 'unset' to /dev/null. (#482888)
-rw-r--r--event.d/rc12
-rw-r--r--rc.d/init.d/functions2
-rwxr-xr-xrc.d/rc2
3 files changed, 3 insertions, 3 deletions
diff --git a/event.d/rc1 b/event.d/rc1
index 57268d45..38397b31 100644
--- a/event.d/rc1
+++ b/event.d/rc1
@@ -23,7 +23,7 @@ end script
post-stop script
clear
TEXTDOMAIN=initscripts
- . /etc/profile.d/lang.sh
+ . /etc/profile.d/lang.sh 2>/dev/null
echo $"Telling INIT to go to single user mode."
exec telinit S
end script
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 70821c5f..9825019a 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -19,7 +19,7 @@ export PATH
[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="`/sbin/consoletype`"
if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" -a -z "${LANGSH_SOURCED:-}" ] ; then
- . /etc/profile.d/lang.sh
+ . /etc/profile.d/lang.sh 2>/dev/null
# avoid propagating LANGSH_SOURCED any further
unset LANGSH_SOURCED
fi
diff --git a/rc.d/rc b/rc.d/rc
index 50bd477f..aaa45e66 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -52,7 +52,7 @@ fi
# Set language, vc settings once to avoid doing it for every init script
# through functions
if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" ] ; then
- . /etc/profile.d/lang.sh
+ . /etc/profile.d/lang.sh 2>/dev/null
export LANGSH_SOURCED=1
fi