diff options
| author | Bill Nottingham <notting@redhat.com> | 2007-06-22 21:20:57 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2007-06-22 21:20:57 +0000 |
| commit | e6575a0edc481c17d040457d0c783c96336fe521 (patch) | |
| tree | c6cfcb35f37854b224f1a7fb301103b1e48f12f9 | |
| parent | 8f063811fd3e9feb74435f3f97e5ae7c4b5a6fa8 (diff) | |
| download | initscripts-r8-45-16-EL.tar.gz initscripts-r8-45-16-EL.tar.xz initscripts-r8-45-16-EL.zip | |
- init.d/halt: don't shut down the network in kexec (#223932, <mchristi@redhat.com>)r8-45-16-EL
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rwxr-xr-x | rc.d/init.d/halt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec index ff729995..1b7f9d73 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -201,6 +201,7 @@ rm -rf $RPM_BUILD_ROOT - network-functions: fix logic error in install_bonding_driver (#229643) - add init script for netconsole (#223742) - ifup-eth: set 'primary' later for bonding devices (#236897, <agospoda@redhat.com>) +- init.d/halt: don't shut down the network in kexec (#223932, <mchristi@redhat.com>) * Mon Jan 15 2007 Bill Nottingham <notting@redhat.com> 8.45.14.EL-1 - set MACADDR, if specified, before bringing up bonding master/slaves (#218792) diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index 8fd5d268..2e5d8150 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -214,7 +214,7 @@ if [ "$command" = /sbin/halt -a -r /etc/ups/upsmon.conf -a -f /etc/killpower -a fi # First, try kexec. If that fails, fall back to rebooting the old way. -[ -n "$kexec_command" ] && $kexec_command -e >& /dev/null +[ -n "$kexec_command" ] && $kexec_command -e -x >& /dev/null HALTARGS="-d" [ -f /poweroff -o ! -f /halt ] && HALTARGS="$HALTARGS -p" |