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

Fix various bugs for nfs dump

Browse Source
This commit is contained in:
Cong Wang 2012-01-25 16:58:35 +08:00
parent 8a14c620b7
commit c461ec7057
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kdump_dracut_modules/99kdumpbase/module-setup.sh
View File

@ -24,25 +24,18 @@ to_udev_name() {
echo ${dev#/dev/} echo ${dev#/dev/}
} }
gen_new_conf () {
if [ ! -f $2 ]
then
sed -ne '/^#/!p' /etc/kdump.conf > $2
fi
sed -i -e "s#$1#/dev/$(to_udev_name $1)#" $2
}
depends() { depends() {
echo "base shutdown" echo "base shutdown"
return 0 return 0
} }
install() { install() {
sed -ne '/^#/!p' /etc/kdump.conf > /tmp/$$-kdump.conf
while read config_opt config_val; while read config_opt config_val;
do do
case "$config_opt" in case "$config_opt" in
ext[234]|xfs|btrfs|minix|raw) ext[234]|xfs|btrfs|minix|raw)
gen_new_conf $config_val /tmp/$$-kdump.conf sed -i -e "s#$1#/dev/$(to_udev_name $1)#" /tmp/$$-kdump.conf
;; ;;
esac esac
done < /etc/kdump.conf done < /etc/kdump.conf

5
kexec-tools.spec
View File

@ -1,6 +1,6 @@
Name: kexec-tools Name: kexec-tools
Version: 2.0.3 Version: 2.0.3
Release: 34%{?dist} Release: 35%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/System Group: Applications/System
Summary: The kexec/kdump userspace component. Summary: The kexec/kdump userspace component.
@ -289,6 +289,9 @@ done
%changelog %changelog
* Wed Jan 25 2012 Cong Wang <xiyou.wangcong@gmail.com> - 2.0.2-35
- Fix various bugs for nfs dump.
* Wed Jan 25 2012 Cong Wang <xiyou.wangcong@gmail.com> - 2.0.2-34 * Wed Jan 25 2012 Cong Wang <xiyou.wangcong@gmail.com> - 2.0.2-34
- kdump.sh cleanup for fstab handling, from Dave Young. - kdump.sh cleanup for fstab handling, from Dave Young.

32
mkdumprd
View File

@ -10,7 +10,7 @@ export IN_KDUMP=1
conf_file="/etc/kdump.conf" conf_file="/etc/kdump.conf"
extra_modules="" extra_modules=""
dracut_args=("-m" "kdumpbase" "--add" "dash" "--add" "fstab-sys" "-c" "/dev/null" "-I" "/sbin/makedumpfile") dracut_args=("-m" "kdumpbase" "--add" "dash" "--add" "fstab-sys" "--add" "kernel-modules" "-c" "/dev/null" "-I" "/sbin/makedumpfile")
add_dracut_arg() { add_dracut_arg() {
while [ $# -gt 0 ]; while [ $# -gt 0 ];
@ -79,6 +79,19 @@ check_remote() {
return return
} }
add_mount() {
local _dev=$(to_dev_name "$1")
local _mnt=$(to_mount "$1")
if [ "$_dev" = "$(get_rootdev)" ]; then
:
elif [ -n "$_mnt" ]; then
add_dracut_mount "$_mnt"
else
return 1
fi
return 0
}
add_dracut_mount "$(to_mount "$(get_rootdev)")" add_dracut_mount "$(to_mount "$(get_rootdev)")"
if [ -n "$conf_file" ]; then if [ -n "$conf_file" ]; then
while read config_opt config_val; while read config_opt config_val;
@ -88,13 +101,8 @@ if [ -n "$conf_file" ]; then
extra_modules="$extra_modules $config_val" extra_modules="$extra_modules $config_val"
;; ;;
ext[234]|xfs|btrfs|minix) ext[234]|xfs|btrfs|minix)
_dev=$(to_dev_name "$config_val") add_mount "$config_val"
_mnt=$(to_mount "$config_val") if [ $? -ne 0 ]
if [ "$_dev" = "$(get_rootdev)" ]; then
:
elif [ -n "$_mnt" ]; then
add_dracut_mount "$_mnt"
else
echo "Dump target $config_val is probably not mounted." echo "Dump target $config_val is probably not mounted."
exit 1 exit 1
fi fi
@ -109,11 +117,15 @@ if [ -n "$conf_file" ]; then
add_dracut_module "ssh-client" add_dracut_module "ssh-client"
else else
add_dracut_module "nfs" add_dracut_module "nfs"
add_dracut_mount "$(to_mount $config_val)" add_mount "$config_val"
if [ $? -ne 0 ]
echo "Dump target $config_val is probably not mounted."
exit 1
fi
fi fi
;; ;;
core_collector) core_collector)
add_dracut_arg "-I" "${config_val% *}" add_dracut_arg "-I" "${config_val%% *}"
;; ;;
extra_bins) extra_bins)
add_dracut_arg "-I" "$config_val" add_dracut_arg "-I" "$config_val"