aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/init.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-09-23 14:28:51 -0400
committerBill Nottingham <notting@redhat.com>2008-09-23 14:28:51 -0400
commitde71796ec6544630765462b2c0c339d45acc314a (patch)
tree1ec3a3122ceb04c513499a7ccebceca76b882623 /rc.d/init.d
parent466a61e3d8da136aa1c9e3cfdbd5ea91517e20b0 (diff)
downloadinitscripts-de71796ec6544630765462b2c0c339d45acc314a.tar
initscripts-de71796ec6544630765462b2c0c339d45acc314a.tar.gz
initscripts-de71796ec6544630765462b2c0c339d45acc314a.tar.bz2
initscripts-de71796ec6544630765462b2c0c339d45acc314a.tar.xz
initscripts-de71796ec6544630765462b2c0c339d45acc314a.zip
Check that we're on a tty before trying to start a repair shell. (#463161)
If netfs isn't running from a tty (say, from NetworkManager), the attempt to start a shell will fail, and we'll immediately fall through to rebooting. That isn't good.
Diffstat (limited to 'rc.d/init.d')
-rwxr-xr-xrc.d/init.d/netfs4
1 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index c0ea8525..0a30f0e6 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -73,8 +73,8 @@ case "$1" in
if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
/usr/bin/rhgb-client --details=yes >/dev/null 2>&1
fi
-
- failure "$STRING"
+` ` failure "$STRING"
+` ` tty >/dev/null 2>&1 || exit 1
echo
echo
echo $"*** An error occurred during the file system check."