aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-07-28 23:10:22 -0400
committerBill Nottingham <notting@redhat.com>2008-07-28 23:10:22 -0400
commit327cfaeab96ffbec4145648de16d58346d4b3f9a (patch)
tree82d6d22618521029f6dd7839b0a441dbaec661d4
parent2ad81727bd98d4c8364dfdc7f65d105972c93e1c (diff)
downloadinitscripts-327cfaeab96ffbec4145648de16d58346d4b3f9a.tar
initscripts-327cfaeab96ffbec4145648de16d58346d4b3f9a.tar.gz
initscripts-327cfaeab96ffbec4145648de16d58346d4b3f9a.tar.bz2
initscripts-327cfaeab96ffbec4145648de16d58346d4b3f9a.tar.xz
initscripts-327cfaeab96ffbec4145648de16d58346d4b3f9a.zip
Properly hide the plymouth splash if needed.
Also, remove some old rhgb code.
-rwxr-xr-xrc.d/init.d/functions12
-rwxr-xr-xrc.d/rc.sysinit18
2 files changed, 10 insertions, 20 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 09f47f37..058599f0 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -511,22 +511,10 @@ action() {
STRING=$1
echo -n "$STRING "
- if [ "${RHGB_STARTED:-}" != "" -a -w /etc/rhgb/temp/rhgb-console ]; then
- echo -n "$STRING " > /etc/rhgb/temp/rhgb-console
- fi
shift
"$@" && success $"$STRING" || failure $"$STRING"
rc=$?
echo
- if [ "${RHGB_STARTED:-}" != "" -a -w /etc/rhgb/temp/rhgb-console ]; then
- if [ "$rc" = "0" ]; then
- echo_success > /etc/rhgb/temp/rhgb-console
- else
- echo_failure > /etc/rhgb/temp/rhgb-console
- [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes
- fi
- echo > /etc/rhgb/temp/rhgb-console
- fi
return $rc
}
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 81335c01..2a6193e7 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -30,6 +30,9 @@ fi
. /etc/init.d/functions
+PLYMOUTH=
+[ -x /usr/bin/plymouth ] && PLYMOUTH=yes
+
# Check SELinux status
selinuxfs="$(fstab_decode_str `LC_ALL=C awk '/ selinuxfs / { print $2 }' /proc/mounts`)"
SELINUX_STATE=
@@ -65,6 +68,7 @@ relabel_selinux() {
if [ "$AUTORELABEL" = "0" ]; then
rm -f /.autorelabel
+ [ -n "$PLYMOUTH" ] && plymouth --hide-splash
echo
echo $"*** Warning -- SELinux ${SELINUXTYPE} policy relabel is required. "
echo $"*** /etc/selinux/config indicates you want to manually fix labeling"
@@ -79,6 +83,7 @@ relabel_selinux() {
echo $"Automatic reboot in progress."
reboot -f
else
+ [ -n "$PLYMOUTH" ] && plymouth --hide-splash
echo
echo $"*** Warning -- SELinux ${SELINUXTYPE} policy relabel is required."
echo $"*** Relabeling could take a very long time, depending on file"
@@ -92,6 +97,7 @@ relabel_selinux() {
reboot -f
fi
echo $SELINUX_STATE > $selinuxfs/enforce
+ [ -n "$PLYMOUTH" ] && plymouth --show-splash
fi
}
@@ -373,6 +379,7 @@ elif [ -f /.autofsck ]; then
AUTOFSCK_OPT="$AUTOFSCK_OPT -f"
fi
if [ -n "$AUTOFSCK_SINGLEUSER" ]; then
+ [ -n "$PLYMOUTH" ] && plymouth --hide-splash
echo
echo $"*** Warning -- the system did not shut down cleanly. "
echo $"*** Dropping you to a shell; the system will continue"
@@ -380,6 +387,7 @@ elif [ -f /.autofsck ]; then
[ -n "$SELINUX_STATE" ] && echo "0" > $selinuxfs/enforce
sulogin
[ -n "$SELINUX_STATE" ] && echo "1" > $selinuxfs/enforce
+ [ -n "$PLYMOUTH" ] && plymouth --show-splash
fi
fsckoptions="$AUTOFSCK_OPT $fsckoptions"
fi
@@ -545,11 +553,7 @@ if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then
STRING=$"Checking filesystems"
echo $STRING
- 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
- fi
+ fsck -T -t noopts=_netdev -A $fsckoptions
rc=$?
if [ "$rc" -eq "0" ]; then
@@ -568,9 +572,7 @@ if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then
# A return of 4 or higher means there were serious problems.
if [ $rc -gt 1 ]; then
- if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
- /usr/bin/rhgb-client --quit
- fi
+ [ -n "$PLYMOUTH" ] && plymouth --hide-splash
failure "$STRING"
echo