rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fixing kcp.c typo and making scp work in mkdumprd

Browse Source
This commit is contained in:
Neil Horman 2006-08-30 20:34:16 +00:00
parent 18d627335b
commit 91d1880e3e
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kcp.c
View File

@ -159,7 +159,6 @@ int main(int argc, char *argv[])
/*need to include login info if scp to remote host*/
if (using_ssh)
path=new_dst;
src, path;
if (execlp("scp", "scp", "-q", "-o", "BatchMode=yes", "-o",
"StrictHostKeyChecking=no", src, path, NULL) < 0) {
perror("Failed to run scp\n");

6
kdump.conf
View File

@ -14,6 +14,12 @@
# <user@location>:/var/crash/%DATE/, supports DNS
# <fs type> - will mount -t <fs type> /mnt and copy /proc/vmcore to
# /mnt/var/crash/%DATE/
# ifc <interface> - instead of bringing up the interface that is normally associated
# with the next hop of the ip address you plan to use with scp or nfs
# activate this interface instead. This is sometimes needed in the event
# that the kdump kernel assigns your interface a different name, given
# that it only loads the driver needed for the specific interface you are
# going to use
# default reboot - if all of the above fail, then reboot the system
# and accept the /proc/vmcore is lost, else
# comment out 'default' to fall through and fix

32
mkdumprd
View File

@ -413,7 +413,13 @@ handlenetdev() {
IPSTR="$IPSTR --dns $DNS1"
fi
fi
#when kdump boots the netdevice name might be different. this
#lets us override the name we normally think it is
if [ -n "$KDUMP_IFC" ]; then
dev=$KDUMP_IFC
fi
network="network --device $dev --bootproto $BOOTPROTO $IPSTR"
}
while [ $# -gt 0 ]; do
@ -819,7 +825,6 @@ if [ -z "$MNTIMAGE" -o -z "$IMAGE" ]; then
error "Error creating temporaries. Try again"
exit 1
fi
if [ -n "$KDUMP_CONFIG_FILE" ]; then
while read type location; do
@ -833,7 +838,7 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
#find ethernet device used to route to remote host, ie eth0
netdev=`/sbin/ip route get to $rhost 2>&1`
[ $? != 0 ] && echo "Bad kdump location: $location" && continue
netdev=`echo $netdev|awk '{print $5;}'|head -n 1`
netdev=`echo $netdev|awk '{print $3;}'|head -n 1`
#add the ethernet device to the list of modules
handlenetdev $netdev
@ -841,6 +846,12 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
#load nfs modules, if needed
echo $location | grep -v "@" > /dev/null && findmodule nfs
;;
ifc)
KDUMP_IFC=$location
if [ -n "$network" ]; then
network=`echo $network | sed -e's/\(^.* \)\('$netdev'\)\( .*$\)/\1 '$KDUMP_IFC' \3/'`
fi
;;
*)
;;
esac
@ -945,6 +956,7 @@ done
for i in 0 1 2 3 ; do
emit "mknod /dev/ttyS$i c 4 $(($i + 64))"
done
emit "mknod /dev/mem c 1 1"
emit "echo Setting up hotplug."
emit "hotplug"
@ -1036,7 +1048,7 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
#timezone info for date which outputs YYYY-MM-DD-hh:mm
cp /etc/localtime $MNTIMAGE/etc/localtime
bin="/sbin/reboot /sbin/kcp"
bin="/sbin/reboot /sbin/kcp /bin/mkdir"
#traverse the config file and setup each dump location
while read type location; do
@ -1061,6 +1073,14 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
;;
net)
#ssh, scp require libraries that aren't found with ldd
lib=/lib && [ -d "/lib64" ] && lib=/lib64
k_extras="/$lib/libnss_compat.so.2 /$lib/libnss_files.so.2"
# bring up the network
emit "echo Bring up network"
emit $network
#grab remote host and xlate into numbers
rhost=`echo $location | sed 's/.*@//' | cut -d':' -f1`
need_dns=`echo $rhost|grep [a-zA-Z]`
@ -1126,12 +1146,10 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
emit "cond kcp --ssh /proc/vmcore $rlocation:/var/crash/$lhost-%DATE/vmcore"
emit "cond reboot -h -f"
bin="$bin /usr/bin/scp /usr/bin/ssh /bin/dd"
#ssh, scp require libraries that aren't found with ldd
lib=/lib && [ -d "/lib64" ] && lib=/lib64
k_extras="/$lib/libnss_compat.so.2 /$lib/libnss_files.so.2"
fi
;;
ifc)
;;
default)
[ "$location" == "reboot" ] && emit "reboot -h -f"
#else load normally on default failure case