diff options
-rw-r--r-- | initscripts.spec | 4 | ||||
-rwxr-xr-x | rc.d/init.d/functions | 3 | ||||
-rwxr-xr-x | rc.d/rc | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec index 2b22a3e5..a943bf85 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -242,6 +242,10 @@ rm -rf $RPM_BUILD_ROOT %config /etc/ppp/ipv6-up %config /etc/ppp/ipv6-down %config /etc/initlog.conf +%dir /etc/serel +%config /etc/serel/default.rdf +%config(noreplace) /etc/serel/local.rdf +%config(noreplace) /etc/serel/serel.conf %doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 %ghost %attr(0664,root,utmp) /var/log/wtmp %ghost %attr(0664,root,utmp) /var/run/utmp diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index cf5cbc27..123286df 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -35,6 +35,7 @@ fi # Read in our configuration if [ -z "${BOOTUP:-}" ]; then + SEREL_BOOT=no if [ -f /etc/sysconfig/init ]; then . /etc/sysconfig/init else @@ -532,8 +533,6 @@ EOF # Use serel to start in parallel? # redhat_sysvinit_start () { -SEREL_BOOT=no - # 0, 1 and 6 don't need serel # if [ "$CONFIRM" != "yes" ] && [ $runlevel = "2" -o $runlevel = "3" -o $runlevel = "4" -o $runlevel = "5" ]; then @@ -11,6 +11,9 @@ runlevel=$2 previous=$1 export runlevel previous +echo -n "Starting rc (runlevel $runlevel): " >> /var/log/boottime.log +date >> /var/log/boottime.log + . /etc/init.d/functions # See if we want to be in user confirmation mode @@ -50,7 +53,7 @@ for i in /etc/rc$runlevel.d/K* ; do done # Now run the START scripts in parallel with serel, if available. -if [ -x /sbin/sereld ]; then +if [ -x /usr/bin/sereld ]; then redhat_sysvinit_start fi @@ -87,3 +90,6 @@ for i in /etc/rc$runlevel.d/S* ; do action $"Starting $subsys: " $i start fi done +echo -n "Finishing rc: " >> /var/log/boottime.log +date >> /var/log/boottime.log +echo >> /var/log/boottime.log |