aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-11-03 11:30:18 -0400
committerBill Nottingham <notting@redhat.com>2010-11-03 11:30:18 -0400
commit4249af37f490c5ab40b8609929e29ff5509cab9c (patch)
tree474cd603c0416cba47819d24dfb71e63f9995029
parent71a9e5bb7261d79eba83b082151b2a48af42c735 (diff)
downloadinitscripts-4249af37f490c5ab40b8609929e29ff5509cab9c.tar
initscripts-4249af37f490c5ab40b8609929e29ff5509cab9c.tar.gz
initscripts-4249af37f490c5ab40b8609929e29ff5509cab9c.tar.bz2
initscripts-4249af37f490c5ab40b8609929e29ff5509cab9c.tar.xz
initscripts-4249af37f490c5ab40b8609929e29ff5509cab9c.zip
Don't use rhgb-client; it's long since deprecated.
-rwxr-xr-xrc.d/rc.sysinit9
-rwxr-xr-xsystemd/fedora-configure4
2 files changed, 7 insertions, 6 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index ff003e92..da519504 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -537,8 +537,9 @@ fi
# Configure machine if necessary.
if [ -f /.unconfigured ]; then
- if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
- /usr/bin/rhgb-client --quit
+
+ if [ -x /usr/bin/plymouth ]; then
+ /usr/bin/plymouth quit
fi
if [ -x /usr/bin/system-config-keyboard ]; then
@@ -654,7 +655,7 @@ if strstr "$cmdline" confirm ; then
fi
# Let rhgb know that we're leaving rc.sysinit
-if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
- /usr/bin/rhgb-client --sysinit
+if [ -x /usr/bin/plymouth ]; then
+ /usr/bin/plymouth --sysinit
fi
diff --git a/systemd/fedora-configure b/systemd/fedora-configure
index 63e6e4c7..e6779fed 100755
--- a/systemd/fedora-configure
+++ b/systemd/fedora-configure
@@ -4,8 +4,8 @@
. /etc/init.d/functions
-if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
- /usr/bin/rhgb-client --quit
+if [ -x /usr/bin/plymouth ]; then
+ /usr/bin/plymouth quit
fi
if [ -x /usr/sbin/firstboot ]; then