aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2003-04-30 20:32:47 +0000
committerBill Nottingham <notting@redhat.com>2003-04-30 20:32:47 +0000
commit4225570cbd69a740e58045e3ad05d3d496184afe (patch)
treea880100fc5f83344b575832acb4a461128be1f56 /rc.d
parent5d6ea8b3450b9b85e222815e131e2772f62650d1 (diff)
downloadinitscripts-4225570cbd69a740e58045e3ad05d3d496184afe.tar
initscripts-4225570cbd69a740e58045e3ad05d3d496184afe.tar.gz
initscripts-4225570cbd69a740e58045e3ad05d3d496184afe.tar.bz2
initscripts-4225570cbd69a740e58045e3ad05d3d496184afe.tar.xz
initscripts-4225570cbd69a740e58045e3ad05d3d496184afe.zip
rhgb updates
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/init.d/functions18
-rwxr-xr-xrc.d/rc.sysinit9
2 files changed, 16 insertions, 11 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index ebfb2483..e1feaf7e 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -318,9 +318,6 @@ echo_success() {
[ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
echo -n " ]"
echo -ne "\r"
- if [ "$BOOTUP" = "graphical" -a -x /usr/bin/rhgb-client ]; then
- /usr/bin/rhgb-client -ping
- fi
return 0
}
@@ -332,9 +329,6 @@ echo_failure() {
[ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
echo -n "]"
echo -ne "\r"
- if [ "$BOOTUP" = "graphical" -a -x /usr/bin/rhgb-client ]; then
- /usr/bin/rhgb-client -ping
- fi
return 1
}
@@ -346,9 +340,6 @@ echo_passed() {
[ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
echo -n "]"
echo -ne "\r"
- if [ "$BOOTUP" = "graphical" -a -x /usr/bin/rhgb-client ]; then
- /usr/bin/rhgb-client -ping
- fi
return 1
}
@@ -360,10 +351,15 @@ echo_warning() {
[ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
echo -n "]"
echo -ne "\r"
+ return 1
+}
+
+# Inform the graphical boot of our current state
+update_boot_stage() {
if [ "$BOOTUP" = "graphical" -a -x /usr/bin/rhgb-client ]; then
- /usr/bin/rhgb-client -ping
+ /usr/bin/rhgb-client --update="$1"
fi
- return 1
+ return 0
}
# Log that something succeeded
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 49aabc7c..2415c414 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -44,6 +44,7 @@ if [ "$HOSTTYPE" != "s390" -a "$HOSTTYPE" != "s390x" ]; then
fi
fi
+update_boot_stage RCconsole
if [ "$CONSOLETYPE" = "vt" -a -x /sbin/setsysfont ]; then
echo -n "Setting default font ($SYSFONT): "
/sbin/setsysfont
@@ -78,6 +79,7 @@ if [ -n "$LOGLEVEL" ]; then
fi
# Mount /proc (done here so volume labels can work with fsck)
+update_boot_stage RCproc
action $"Mounting proc filesystem: " mount -n -t proc /proc /proc
# Unmount the initrd, if necessary
@@ -90,9 +92,11 @@ if LC_ALL=C grep -q /initrd /proc/mounts && ! LC_ALL=C grep -q /initrd/loopfs /p
fi
# Configure kernel parameters
+update_boot_stage RCkernelparam
action $"Configuring kernel parameters: " sysctl -e -p /etc/sysctl.conf
# Set the system clock.
+update_boot_stage RCclock
ARC=0
SRM=0
UTC=0
@@ -157,12 +161,14 @@ if [ "$CONSOLETYPE" = "vt" -a -x /bin/loadkeys ]; then
fi
# Set the hostname.
+update_boot_stage RChostname
action $"Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME}
# Only read this once.
cmdline=$(cat /proc/cmdline)
# Initialize USB controller and HID devices
+update_boot_stage RCusb
usb=0
if ! strstr "$cmdline" nousb ; then
if ! LC_ALL=C grep -q "usb" /proc/devices 2>/dev/null ; then
@@ -318,6 +324,7 @@ if [ -x /sbin/isapnp -a -f /etc/isapnp.conf -a ! -f /proc/isapnp ]; then
fi
# Remount the root filesystem read-write.
+update_boot_stage RCmountfs
state=`awk '/ \/ / && ($3 !~ /rootfs/) { print $4 }' /proc/mounts`
[ "$state" != "rw" ] && \
action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw /
@@ -331,6 +338,7 @@ if [ -f /etc/lvmtab ]; then
fi
# Start up swapping.
+update_boot_stage RCswap
action $"Activating swap partitions: " swapon -a -e
# Clear mtab
@@ -414,6 +422,7 @@ if [ -f /etc/rc.modules ]; then
/etc/rc.modules
fi
+update_boot_stage RCraid
if [ -f /etc/raidtab ]; then
# Add raid devices
[ -f /proc/mdstat ] || modprobe md >/dev/null 2>&1