Attachment 289946 Details for Bug 368941 – correct patch

[patch] correct patch

mkdumprd.patch (text/plain), 1.45 KB, created by Neil Horman on 2007-12-18 22:12:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-12-18 22:12:25 UTC

Size: 1.45 KB

patch

obsolete

>? .mkdumprd.swp
>Index: mkdumprd
>===================================================================
>RCS file: /cvs/dist/rpms/kexec-tools/RHEL-5/mkdumprd,v
>retrieving revision 1.67
>diff -u -r1.67 mkdumprd
>--- mkdumprd	26 Nov 2007 21:18:27 -0000	1.67
>+++ mkdumprd	18 Dec 2007 22:11:37 -0000
>@@ -66,7 +66,6 @@
> fstab="/etc/fstab"
> 
> vg_list=""
>-net_list=""
> USING_METHOD=""
> SAVE_PATH=/var/crash
> bin=""
>@@ -716,14 +715,7 @@
> 
>     rootdev=$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' $fstab)
>     # check if it's nfsroot
>-    if [ "$rootfs" == "nfs" ]; then
>-	remote=$(echo $rootdev | cut -d : -f 1)
>-	# FIXME: this doesn't handle ips properly
>-	remoteip=$(getent hosts $remote | cut -d ' ' -f 1) 
>-	netdev=`/sbin/ip route get to $remoteip |sed 's|.*dev $.*$.*|\1|g' |awk {'print $1;'} |head -n 1`	
>-	net_list="$net_list $netdev"
>-    # check if it's root by label
>-    elif echo $rootdev | cut -c1-6 | grep -q "LABEL=" ; then
>+    if echo $rootdev | cut -c1-6 | grep -q "LABEL=" ; then
>     	rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' \
>                      -e 's/^r[ow]$/defaults/' -e 's/$/,ro/')
>         majmin=$(get_numeric_dev dec /dev/root)
>@@ -1491,14 +1483,6 @@
>     emit "mknod /dev/mapper/control b \$DM_MAJ \$DM_MIN"
> fi
> 
>-if [ -n "$net_list" ]; then
>-    for netdev in $net_list; do 
>-	emit "echo Bringing up $netdev"
>-	handle_netdev $netdev
>-	#emit $network
>-    done
>-fi
>-
> emitdms
> 
> if [ -n "$raiddevices" ]; then

Actions: View | Diff

Attachments on bug 368941: 289925 | 289946 | 306796 | 308244 | 308358 | 313279 | 313280 | 313281 | 313282 | 313283