|
|
Author: nhorman
Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13902
Modified Files:
kexec-tools.spec mkdumprd
Log Message:
updating mkdumprd
Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kexec-tools.spec 28 Aug 2006 18:57:08 -0000 1.60
+++ kexec-tools.spec 31 Aug 2006 13:23:33 -0000 1.61
@@ -1,6 +1,6 @@
Name: kexec-tools
Version: 1.101
-Release: 50%{?dist}
+Release: 51%{?dist}
License: GPL
Group: Applications/System
Summary: The kexec/kdump userspace component.
@@ -159,6 +159,10 @@
%doc TODO
%changelog
+* Thu Aug 31 2006 Neil Horman <nhorman@xxxxxxxxxx> - 1.101-51%{dist}
+- update mkdumprd to properly do scp and nfs based dumps
+- update docs in kdump.conf to reflect new ifc parameter
+
* Mon Aug 28 2006 Neil Horman <nhorman@xxxxxxxxxx> - 1.101-50%{dist}
- updating to build without need for asm/page.h on x86_64
Index: mkdumprd
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mkdumprd 30 Aug 2006 20:34:16 -0000 1.5
+++ mkdumprd 31 Aug 2006 13:23:33 -0000 1.6
@@ -1076,7 +1076,11 @@
#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"
-
+ bin="$bin /usr/bin/scp /usr/bin/ssh /bin/dd /bin/cp"
+
+ #build an /etc/passwd for scp to work properly
+ grep "^root" /etc/passwd > $MNTIMAGE/etc/passwd
+
# bring up the network
emit "echo Bring up network"
emit $network
@@ -1113,7 +1117,8 @@
#setup nfs case
mkdir -p $MNTIMAGE/mnt
emit "mount -t nfs -o nolock $rlocation /mnt"
- emit "cond kcp --local /proc/vmcore
/mnt/var/crash/$lhost-%DATE/vmcore"
+ emit "dd if=/dev/mem of=/dev/urandom count=1 bs=512
skip=100"
+ emit "cond kcp --local /proc/vmcore
/mnt/var/crash/$lhost-%DATE"
emit "cond reboot -h -f"
else
#SSH path
@@ -1135,7 +1140,6 @@
#setup ssh case, quick check to see if setup already
if [ ! -r $MNTIMAGE/dev/urandom ]; then
#only need to do these once
- grep "^root" /etc/passwd > $MNTIMAGE/etc/passwd
mkdir -p $MNTIMAGE/root
cp -a /root/.ssh $MNTIMAGE/root/
cp -a /etc/ssh $MNTIMAGE/etc
@@ -1143,9 +1147,8 @@
emit "mknod /dev/urandom c 1 9"
fi
emit "dd if=/dev/mem of=/dev/urandom count=1 bs=512
skip=100"
- emit "cond kcp --ssh /proc/vmcore
$rlocation:/var/crash/$lhost-%DATE/vmcore"
+ emit "cond kcp --ssh /proc/vmcore
$rlocation:/var/crash/$lhost-%DATE"
emit "cond reboot -h -f"
- bin="$bin /usr/bin/scp /usr/bin/ssh /bin/dd"
fi
;;
ifc)
@@ -1174,7 +1177,7 @@
emit "echo Saving to the local filesystem $location"
emit "fsck.$type $location"
emit "cond mount -t $type $location /mnt"
- emit "cond kcp --local /proc/vmcore
/mnt/var/crash/$lhost-%DATE/vmcore"
+ emit "cond kcp --local /proc/vmcore
/mnt/var/crash/$lhost-%DATE"
emit "cond umount /mnt"
emit "cond reboot -h -f"
bin="$bin /sbin/fsck.$type /bin/mount"
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|