aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-04-29 15:51:48 +0000
committerBill Nottingham <notting@redhat.com>2005-04-29 15:51:48 +0000
commit69bfeb78e13d82d51e110105be8a96d3d0b44d3e (patch)
treee3701b4357ddb16e2484bb66a95facfd548cca20
parentf30714aabace8847a225899e9427cad86b7cb5c5 (diff)
downloadinitscripts-69bfeb78e13d82d51e110105be8a96d3d0b44d3e.tar
initscripts-69bfeb78e13d82d51e110105be8a96d3d0b44d3e.tar.gz
initscripts-69bfeb78e13d82d51e110105be8a96d3d0b44d3e.tar.bz2
initscripts-69bfeb78e13d82d51e110105be8a96d3d0b44d3e.tar.xz
initscripts-69bfeb78e13d82d51e110105be8a96d3d0b44d3e.zip
fix hang on stale gdm fifo (#156355)
-rwxr-xr-xrc.d/init.d/functions2
-rwxr-xr-xrc.d/rc.sysinit1
2 files changed, 2 insertions, 1 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index a7c8fcab..2b28856b 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -380,7 +380,7 @@ failure() {
#fi
[ "$BOOTUP" != "verbose" -a -z "$LSB" ] && echo_failure
[ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes
- [ -w /var/gdm/.gdmfifo ] && echo "BOOTUP_ERRORS" > /var/gdm/.gdmfifo
+ [ -w /var/gdm/.gdmfifo ] && echo "BOOTUP_ERRORS" > /var/gdm/.gdmfifo &
return $rc
}
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 83205b7d..11f485a4 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -579,6 +579,7 @@ for afile in /var/lock/* /var/run/* ; do
fi
done
rm -f /var/lib/rpm/__db* &> /dev/null
+rm -f /var/gdm/.gdmfifo &> /dev/null
# Reset pam_console permissions
[ -x /sbin/pam_console_apply ] && /sbin/pam_console_apply -r