aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2007-09-28 19:37:26 +0000
committerBill Nottingham <notting@redhat.com>2007-09-28 19:37:26 +0000
commitb2b233f35fec08abc8f617053a75c4f8ac856206 (patch)
tree591aeef05d0b529c1dc87ea8f5c25b2ce56dcb93 /rc.d
parent6eeadb8980bf7fc0a43582cabad965cceee2049d (diff)
downloadinitscripts-b2b233f35fec08abc8f617053a75c4f8ac856206.tar
initscripts-b2b233f35fec08abc8f617053a75c4f8ac856206.tar.gz
initscripts-b2b233f35fec08abc8f617053a75c4f8ac856206.tar.bz2
initscripts-b2b233f35fec08abc8f617053a75c4f8ac856206.tar.xz
initscripts-b2b233f35fec08abc8f617053a75c4f8ac856206.zip
don't hang if someone somehow manages to get a dangling pipe in
/etc/rhgb/temp (#251219)
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/rc.sysinit6
1 files changed, 3 insertions, 3 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index ba3cae2c..10f880a4 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -352,7 +352,7 @@ fi
# Start the graphical boot, if necessary; /usr may not be mounted yet, so we
# may have to do this again after mounting
-RHGB_STARTED=0
+RHGB_STARTED=
mount -n /dev/pts >/dev/null 2>&1
[ -n "$SELINUX_STATE" ] && restorecon /dev/pts >/dev/null 2>&1
@@ -637,7 +637,7 @@ if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then
STRING=$"Checking filesystems"
echo $STRING
- if [ "${RHGB_STARTED}" != "0" -a -w /etc/rhgb/temp/rhgb-console ]; then
+ if [ -n "${RHGB_STARTED}" -a -w /etc/rhgb/temp/rhgb-console ]; then
fsck -T -t noopts=_netdev -A $fsckoptions > /etc/rhgb/temp/rhgb-console
else
fsck -T -t noopts=_netdev -A $fsckoptions
@@ -748,7 +748,7 @@ fi
# Start the graphical boot, if necessary and not done yet.
-if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ "$RHGB_STARTED" -eq 0 -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
+if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ -n "$RHGB_STARTED" -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
( . /etc/sysconfig/i18n 2>/dev/null ; /usr/bin/rhgb )
RHGB_STARTED=1
fi