From 79df4118e8c05bf1b996cb63bf4644d6ede3bbe0 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@fedoraproject.org>
Date: Tue, 19 Feb 2008 20:01:55 +0000
Subject: [PATCH] Resolves: bz 433350

---
 kexec-tools.spec |  5 ++++-
 mkdumprd         | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/kexec-tools.spec b/kexec-tools.spec
index 57fe10f..537900d 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.102pre 
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -220,6 +220,9 @@ done
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Tue Feb 19 2008 Neil Horman <nhorman@redhat.com> - 1.102pre-5
+- Modifying mkdumprd to include dynamic executibles (bz 433350)
+
 * Wed Feb 12 2008 Neil Horman <nhorman@redhat.com> - 1.102pre-4
 - bumping rev number for rebuild
 
diff --git a/mkdumprd b/mkdumprd
index 5b6320b..4fe4495 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -814,7 +814,7 @@ emitdm()
     if [ -n "$UUID" ]; then
         UUID="--uuid $UUID"
     fi
-    emit "echo \"$(/sbin/dmsetup table $1)\" | /sbin/dmsetup.static create \"$1\" $UUID"
+    emit "echo \"$(/sbin/dmsetup table $1)\" | /sbin/dmsetup create \"$1\" $UUID"
 }
 
 emitdms()
@@ -830,7 +830,7 @@ emitdms()
             emitdm "$NAME"
             ;;
         part)
-            emit /sbin/kpartx.static -pp -a \"/dev/mapper/$NAME\"
+            emit /sbin/kpartx -pp -a \"/dev/mapper/$NAME\"
             ;;
         esac
     done
@@ -1269,7 +1269,7 @@ fi
 # FIXME -- this can really go poorly with clvm or duplicate vg names.
 # nash should do lvm probing for us and write its own configs.
 if [ -n "$vg_list" ]; then
-    inst /sbin/lvm.static "$MNTIMAGE/bin/lvm"
+    inst /sbin/lvm "$MNTIMAGE/bin/lvm"
     if [ -f /etc/lvm/lvm.conf ]; then
 	cp $verbose --parents /etc/lvm/lvm.conf $MNTIMAGE/
     fi
@@ -1419,7 +1419,7 @@ if [ -n "$vg_list" ]; then
     emit "      DM_NUM=\`echo \$DM_NUM 1 + p | dc\`"
     emit "      if [ -z \"\$noresume\" ]"
     emit "      then"
-    emit "        /sbin/dmsetup.static resume /dev/mapper/\$VGRP-\$i"
+    emit "        /sbin/dmsetup resume /dev/mapper/\$VGRP-\$i"
     emit "      fi"
     emit "   fi"
     emit "done"
@@ -1447,7 +1447,7 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
     emit "hwclock --hctosys \$TIME_FORMAT"
     emit "DATE=\`date +%Y-%m-%d-%T\`"
 
-    bin="/sbin/dmsetup.static /sbin/kpartx.static" 
+    bin="/sbin/dmsetup /sbin/kpartx" 
 
     if [ -n "$CORE_COLLECTOR" ]; then
         bin="$bin /sbin/makedumpfile"