Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2014-05-06 13:59:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdump" Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2014-04-22 16:59:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2014-05-06 13:59:10.000000000 +0200 @@ -1,0 +2,10 @@ +Mon May 5 11:40:52 UTC 2014 - [email protected] + +- Update to 0.8.11 + o Use fast xz compression with dracut (bnc#870549) + o Mount boot/root partition only if needed + o Copy required programs to the initrd (bnc#874571). + +- kdump-0.8.10-dracut-xz-opt.patch: Dropped. + +------------------------------------------------------------------- Old: ---- kdump-0.8.10-dracut-xz-opt.patch kdump-0.8.10-rpmlintrc kdump-0.8.10.tar.bz2 New: ---- kdump-0.8.11-rpmlintrc kdump-0.8.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump.spec ++++++ --- /var/tmp/diff_new_pack.bAOUfr/_old 2014-05-06 13:59:11.000000000 +0200 +++ /var/tmp/diff_new_pack.bAOUfr/_new 2014-05-06 13:59:11.000000000 +0200 @@ -31,7 +31,7 @@ Url: http://freehg.org/u/bwalle/kdump/ Name: kdump -Version: 0.8.10 +Version: 0.8.11 Release: 0 Requires: curl Requires: makedumpfile @@ -59,7 +59,6 @@ Source: %{name}-%{version}.tar.bz2 Source2: %{name}-%{version}-rpmlintrc Source3: kdump.service -Patch1: %{name}-%{version}-dracut-xz-opt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) Provides: kdump-helpers = %{version} @@ -97,7 +96,6 @@ %prep %setup -%patch1 -p1 %build export CFLAGS="%optflags" ++++++ kdump-0.8.10-rpmlintrc -> kdump-0.8.11-rpmlintrc ++++++ ++++++ kdump-0.8.10.tar.bz2 -> kdump-0.8.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/.hg_archival.txt new/kdump-0.8.11/.hg_archival.txt --- old/kdump-0.8.10/.hg_archival.txt 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/.hg_archival.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -repo: bc186d1ee81e4dfdc5721d6a5743a6ed8b3cc457 -node: cdc64f0f5ccaf1cb29344e7b6b02ab090f75d078 -branch: default -latesttag: v0.8.9 -latesttagdistance: 29 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/.hgignore new/kdump-0.8.11/.hgignore --- old/kdump-0.8.10/.hgignore 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/.hgignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -# editor-generatd files -syntax: glob -*.swp -*~ - -# the build system -syntax: glob -CMakeCache.txt -CMakeFiles/ -cmake_install.cmake -Makefile -config.h -DartConfiguration.tcl - -CPackConfig.cmake -CPackSourceConfig.cmake -_CPack_Packages/ - -CTestTestfile.cmake -Testing/ - -# resulting binaries -syntax: regexp -^kdumptool/kdumptool -^kdumptool/testcanonical -^kdumptool/testconfig -^kdumptool/testio -^kdumptool/testkconfig -^kdumptool/testmail -^kdumptool/testreadlink -^kdumptool/testurlparser -^kdumptool/testlistdir - -# generated documentation -syntax: glob -man/*.txt -man/*.[1-8].gz - -syntax: regexp -^doc/implementation/Implementation_Guide.html - -# release packages -syntax: regexp -^kdump-[0-9.]*\.tar\.bz2$ - -# other -build/ -tests/data/tmp/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/.hgtags new/kdump-0.8.11/.hgtags --- old/kdump-0.8.10/.hgtags 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/.hgtags 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -4e2c1718fdf68ee5d5e2e4bffe1650db813cf245 v0.5.0 -d4b4b8805f1be520fcf392aa7560e6a7fd9b0382 v0.5.1 -e9990ad7a4f9c0dddfc5e9a7173ebd0ed0250ea6 v0.5.2 -43157d26c474cd0253e8f7fdbbe655d2199deffb v0.5.3 -28fbf19fec3fc1a668d85b91a057ad4b79be1726 v0.5.4 -d1aabeaa0fdfbcc294fbfbc4a9f4c8fd130f5660 v0.5.5 -893baa67fe94da4ff43ee86efe466534b57ca644 v0.6.0 -3b2c51c3c8379bcdaadaf6dc19939050388173b2 v0.6.1 -36463ceccc2e839a4679fa2b8a85bf64bf094304 v0.6.4 -f55d64c64ea6994fe328dc6a79479050c1a7d216 v0.6.5 -1e61bab2f023b1bda7b89d8c44d9a9797548ef09 v0.6.6 -3a3623a48886cb178707a8412c4daaed5a2fb61e v0.6.7 -2c5f915eb87119727c36851336fcf7bbb9bcd79d v0.7.0 -9e3352acdbf95d2eb8330e89c1fab7eb5e95dd41 v0.7.1 -1827a55a9c250040f3371a856e01637514105f53 v0.7.2 -325916887ce56dd5a034dd5f5e40da18007a3133 v0.7.3 -da179225bff1c55084ea0b3cbe874a23f6c335d3 v0.7.4 -4be6f66af4dc2c5dca1e5b7ddd11986debf3e849 v0.8.0 -d2e9b17943e4b167446228373dc0e3f6ee2a93eb v0.8.1 -d441f2ef4f58d9c85bbb3a79a1994bda61f369a5 v0.8.2 -136fd1ff12ab582149ff06a8d983b414fa3d770c v0.8.3 -a87bf22c9242118de2f7bbf9588923026e40df98 v0.8.4 -ecda86e4831541c15802920b6626f0bb3ab32dca v0.8.5 -1c7dcec40d533dc7642ee39a96030711cac8d8cc v0.8.6 -b6746b1d6db90bf2f870aba69402bbe64fb2759e v0.8.7 -9ecabe6c442e9e09dc4c22cd888e761412555576 v0.8.8 -6a07b59a54ebfb08b9f9e3aae68c2b71f8ae28c3 v0.8.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/CMakeLists.txt new/kdump-0.8.11/CMakeLists.txt --- old/kdump-0.8.10/CMakeLists.txt 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/CMakeLists.txt 2014-05-05 13:37:52.000000000 +0200 @@ -26,7 +26,7 @@ cmake_minimum_required(VERSION 2.6.2) set (PACKAGE_STRING "kdump") -set (PACKAGE_VERSION "0.8.10") +set (PACKAGE_VERSION "0.8.11") include_directories("${PROJECT_BINARY_DIR}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/NEWS new/kdump-0.8.11/NEWS --- old/kdump-0.8.10/NEWS 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/NEWS 2014-05-05 13:37:52.000000000 +0200 @@ -1,3 +1,8 @@ +0.8.11 +------ + * Use fast xz compression with dracut + * Mount boot/root partition only if needed + 0.8.10 ------ * Support snappy compression algorithm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/init/mkdumprd new/kdump-0.8.11/init/mkdumprd --- old/kdump-0.8.10/init/mkdumprd 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/init/mkdumprd 2014-05-05 13:37:52.000000000 +0200 @@ -16,14 +16,15 @@ # 02110-1301, USA. . /lib/kdump/rc.kdump.functions +. /lib/kdump/setup-kdump.functions + +kdump_get_config || return 1 KERNELVERSION= FORCE=0 QUIET=0 MKINITRD_EXTRA_PARAMS= -. "$KDUMP_CONFIG" - # # Prints usage. {{{ function usage() @@ -121,9 +122,8 @@ { local modules="kdump" - . /lib/kdump/setup-kdump.functions - DRACUT_ARGS="--force --hostonly --omit 'systemd plymouth resume usrmount'" + DRACUT_ARGS="$DRACUT_ARGS --compress='xz -0 --check=crc32'" # add mount points kdump_get_mountpoints || return 1 @@ -131,7 +131,7 @@ while [ $i -lt ${#kdump_mnt[@]} ] do if [ -n "${kdump_mnt[i]}" ] ; then - DRACUT_ARGS="$DRACUT_ARGS --mount '${kdump_dev[i]} /kdump/mnt$i ${kdump_fstype[i]} ${kdump_opts[i]}'" + DRACUT_ARGS="$DRACUT_ARGS --mount '${kdump_dev[i]} ${kdump_mnt[i]} ${kdump_fstype[i]} ${kdump_opts[i]}'" fi i=$((i+1)) done @@ -179,8 +179,6 @@ # Make resolved variables visible to the dracut module kdump_export_targets - export KDUMP_mntnum=${#kdump_mnt[@]} - export KDUMP_bootmnt=${kdump_mnt[0]} DRACUT_ARGS="$DRACUT_ARGS --add '$modules' $INITRD $KERNELVERSION" status_message "Calling dracut $DRACUT_ARGS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/init/module-setup.sh new/kdump-0.8.11/init/module-setup.sh --- old/kdump-0.8.10/init/module-setup.sh 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/init/module-setup.sh 2014-05-05 13:37:52.000000000 +0200 @@ -8,11 +8,13 @@ } install() { + # Get configuration + kdump_get_config || return 1 + kdump_import_targets + inst_hook pre-pivot 90 /lib/kdump/save_dump.sh - inst /etc/sysconfig/kdump - inst_multiple makedumpfile makedumpfile-R.pl kdumptool + inst_multiple makedumpfile makedumpfile-R.pl kdumptool \ + $KDUMP_REQUIRED_PROGRAMS - kdump_import_targets - kdump_setup_files "$initdir" sysroot "${!host_fs_types[*]}" \ - "$KDUMP_mntnum" "$KDUMP_bootmnt" + kdump_setup_files "$initdir" "${!host_fs_types[*]}" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/init/save_dump.sh new/kdump-0.8.11/init/save_dump.sh --- old/kdump-0.8.10/init/save_dump.sh 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/init/save_dump.sh 2014-05-05 13:37:52.000000000 +0200 @@ -21,7 +21,6 @@ # Certain shell variables must be set: # -# bootdev boot device (or empty) # dumpdev space-separated list of block devices used for dumping # @@ -112,6 +111,8 @@ { local ret=0 + test -f /etc/fstab.kdump || return 0 + if [ -f /etc/fstab ] ; then mv /etc/fstab /etc/fstab.orig fi @@ -164,11 +165,6 @@ else # # wait for /boot device and dump device(s) - wait_for_dumpdev "$bootdev" boot - if ! continue_error $?; then - return - fi - for dev in $dumpdev ; do wait_for_dumpdev "$dev" dump if ! continue_error $?; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/init/setup-kdump.functions new/kdump-0.8.11/init/setup-kdump.functions --- old/kdump-0.8.10/init/setup-kdump.functions 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/init/setup-kdump.functions 2014-05-05 13:37:52.000000000 +0200 @@ -78,15 +78,18 @@ # Export kdump_*[] arrays, returned by kdump_get_targets. # # Input variables: -# kdump_URL[], kdump_Protocol[], kdump_Host[], kdump_Realpath +# kdump_URL[], kdump_Protocol[], kdump_Host[], kdump_Realpath, +# kdump_mnt[] # Output variables (exported): -# KDUMP_x_URL, KDUMP_x_Protocol, KDUMP_x_Host, KDUMP_x_Realpath +# KDUMP_x_URL, KDUMP_x_Protocol, KDUMP_x_Host, KDUMP_x_Realpath, +# KDUMP_x_mnt function kdump_export_targets() # {{{ { export KDUMP_x_URL=$( printf "%q " "${kdump_URL[@]}" ) export KDUMP_x_Protocol=$( printf "%q " "${kdump_Protocol[@]}" ) export KDUMP_x_Host=$( printf "%q " "${kdump_Host[@]}" ) export KDUMP_x_Realpath=$( printf "%q " "${kdump_Realpath[@]}" ) + export KDUMP_x_mnt=$( printf "%q " "${kdump_mnt[@]}" ) export kdump_max } # }}} @@ -101,6 +104,7 @@ eval "kdump_Protocol=( $KDUMP_x_Protocol )" eval "kdump_Host=( $KDUMP_x_Host )" eval "kdump_Realpath=( $KDUMP_x_Realpath )" + eval "kdump_mnt=( $KDUMP_x_mnt )" } # }}} # @@ -120,38 +124,88 @@ } # }}} # +# Update the kdump mountpoint corresponding to the non-kdump mountpoint. +# If necessary, add a new entry into the kdump_* arrays. +# +# Parameters: +# 1) device mount device +# 2) mountpoint mountpoint in non-kdump environment +# 3) fstype filesystem type +# 4) opts mount options +# Output variable: +# kdump_mountidx mountpoint index in kdump environment +# Input/output variables: +# kdump_mnt[] +# Output variables: +# kdump_dev[] +# kdump_fstype[] +# kdump_opts[] +function kdump_update_mount() # {{{ +{ + local device="$1" + local mountpoint="/kdump/mnt0/${2#/}" + local fstype="$3" + local opts="$4" + local mnt i + + i=0 + for mnt in "${kdump_mnt[@]}" + do + [ "$mnt" = "${mountpoint%/}" ] && break + i=$((i+1)) + mountpoint="/kdump/mnt$i/${mountpoint#/kdump/mnt*/}" + done + + kdump_mnt[i]="${mountpoint%/}" + kdump_dev[i]="$device" + kdump_fstype[i]="$fstype" + kdump_opts[i]="$opts" + + kdump_mountidx=$i +} # }}} + +# # Get kdump mount points and map between running system and kdump system # # Mount point 0 always corresponds to the "/boot" mount point and may be # empty if "/boot" is not on a separate partition. # +# Input variables: +# KDUMP_COPY_KERNEL config option, see kdump(5) # Output variables: # kdump_* target specs (as returned by kdump_get_targets) -# kdump_mnt[i] mountpoint i in the current environment +# kdump_mnt[i] mountpoint i in kdump environment # kdump_dev[i] mount device for mount i # kdump_fstype[i] file system type for mount i # kdump_opts[i] mount options for mount i function kdump_get_mountpoints() # {{{ { local device mountpoint filesystem opts dummy - local protocol realpath fspath mnt + local protocol realpath kdump_mountidx + local rootdev rootmnt rootfstype rootopts + local bootdev bootmnt bootfstype bootopts local -a curmp mntdev mntfstype mntopts - local i j + local i # Populate kdump_*[] arrays with dump target info kdump_get_targets || return 1 - kdump_mnt=( "" ) - kdump_dev=( "" ) - kdump_fstype=( "" ) - kdump_opts=( "" ) + kdump_mnt=( ) + kdump_dev=( ) + kdump_fstype=( ) + kdump_opts=( ) while read device mountpoint filesystem opts dummy ; do - if [ "$mountpoint" = "/boot" -a -z "${kdump_mnt[0]}" ] ; then - kdump_mnt[0]="$mountpoint" - kdump_dev[0]="$device" - kdump_fstype[0]="$filesystem" - kdump_opts[0]="$opts" + if [ "$mountpoint" = "/" ] ; then + rootdev="$device" + rootmnt="$mountpoint" + rootfstype="$filesystem" + rootopts="$opts" + elif [ "$mountpoint" = "/boot" ] ; then + bootdev="$device" + bootmnt="$mountpoint" + bootfstype="$filesystem" + bootopts="$opts" fi i=0 @@ -170,31 +224,23 @@ done done < <(kdump_read_mounts) + # add root/boot if needed + if [ "$KDUMP_COPY_KERNEL" = "yes" ] ; then + if [ -n "$bootdev" ] ; then + kdump_update_mount "$bootdev" "$bootmnt" "$bootfstype" "$bootopts" + else + kdump_update_mount "$rootdev" "$rootmnt" "$rootfstype" "$rootopts" + fi + fi + # map running paths to target paths i=0 while [ $i -le $kdump_max ] ; do mountpoint="${curmp[i]}" if [ -n "$mountpoint" ]; then - fspath="${kdump_Realpath[i]}" - fspath="${fspath#$mountpoint}" - fspath="${fspath#/}" - if [ "$mountpoint" = "/" ] ; then - kdump_Realpath[i]="/root/$fspath" - else - j=0 - for mnt in "${kdump_mnt[@]}" - do - [ "$mnt" = "$mountpoint" ] && break - j=$((j+1)) - done - if [ "$j" -ge "${#kdump_mnt[@]}" ] ; then - kdump_mnt[j]="$mountpoint" - kdump_dev[j]="${mntdev[i]}" - kdump_fstype[j]="${mntfstype[i]}" - kdump_opts[j]="${mntopts[i]}" - fi - kdump_Realpath[i]="/mnt$j/$fspath" - fi + kdump_update_mount "${mntdev[i]}" "$mountpoint" \ + "${mntfstype[i]}" "${mntopts[i]}" + kdump_Realpath[i]="/mnt${kdump_mountidx}${kdump_Realpath[i]}" fi i=$((i+1)) done @@ -214,7 +260,11 @@ function kdump_get_config() # {{{ { local kdump_config=$( kdumptool dump_config --format=shell ) - test $? -eq 0 || return 1 + if [ $? -ne 0 ] ; then + echo >&2 "kdump configuration failed" + return 1 + fi + eval "$kdump_config" return 0 } # }}} @@ -334,66 +384,54 @@ # Create the /kdump hierarchy with mountpoints # Parameters: # 1) root: initrd temporary root -# 2) mnt_root: name of the real root fs mountpoint (in kdump env) -# 3) mntnum: number of /mnt%d mount points -# 4) bootmnt: boot mount point (or empty if /boot is on the root fs) +# Input variables: +# kdump_mnt[] mountpoints in kdump environment function kdump_init_dirs() # {{{ { local root="$1" - local mnt_root="$2" - local mntnum="$3" - local bootmnt="$4" - local i + local i d mnt mkdir -p "${root}/kdump" mkdir -m 01777 "${root}/kdump/tmp" - ln -snf ../"$mnt_root" "${root}/kdump/root" - if [ -n "$bootmnt" ] ; then - ln -snf mnt0 "${root}/kdump/boot" - i=0 - else - ln -snf "../${mnt_root}/boot" "${root}/kdump/boot" - i=1 - fi - while [ $i -lt "$mntnum" ] + i=0 + for mnt in "${kdump_mnt[@]}" do - mkdir "${root}/kdump/mnt${i}" + mkdir -p "${root}$mnt" + d="$mnt/" + d="${d#/kdump/mnt*/}" + case "/${d%/}" in + /) + ln -snf "${mnt#/kdump/}" "${root}/kdump/root" + ;; + /boot) + ln -snf "${mnt#/kdump/}" "${root}/kdump/boot" + ;; + esac i=$((i+1)) done + + test -e "${root}/kdump/boot" || ln -snf "root/boot" "${root}/kdump/boot" } # # Set up or create all necessary files # Parameters: # 1) outdir: initrd temporary root -# 2) mnt_root: name of the root mount point (e.g. "sysroot" for dracut) -# 3) dumpdevs: space-separated list of all block devices required by kdump -# 4) mntnum: number of additional mountpoints -# 5) bootmnt: boot mount point (or empty if /boot is on the root fs) -# Output variables: -# see kdump_get_config +# 2) dumpdevs: space-separated list of all block devices required by kdump +# Input variables: +# KDUMP_* see kdump_get_config +# kdump_mnt[] mountpoints in kdump environment function kdump_setup_files() # {{{ { local outdir="${1%/}" - local mnt_root="$2" - local dumpdevs="$3" - local mntnum="$4" - local bootmnt="$5" + local dumpdevs="$2" local kdump_over_ssh # - # get the configuration - # - if ! kdump_get_config ; then - echo >&2 "kdump configuration failed" - return 1 - fi - - # # initialize the /kdump hierarchy # - kdump_init_dirs "$outdir" "$mnt_root" "$mntnum" "$bootmnt" + kdump_init_dirs "$outdir" # # create target configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/init/setup-kdump.sh new/kdump-0.8.11/init/setup-kdump.sh --- old/kdump-0.8.10/init/setup-kdump.sh 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/init/setup-kdump.sh 2014-05-05 13:37:52.000000000 +0200 @@ -30,8 +30,7 @@ # # Copy or create all necessary files for the initrd # -kdump_setup_files "$tmp_mnt" root "$blockdev" \ - "${#kdump_mnt[@]}" "${kdump_mnt[0]}" +kdump_setup_files "$tmp_mnt" "$blockdev" # # check if extra modules are needed @@ -57,7 +56,6 @@ mkdir -p "${tmp_mnt}/lib/kdump" cp -pL /lib/kdump/save_dump.sh "${tmp_mnt}/lib/kdump/" -save_var bootdev save_var dumpdev # vim: set sw=4 ts=4 et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/init/setup-kdumpfs.sh new/kdump-0.8.11/init/setup-kdumpfs.sh --- old/kdump-0.8.10/init/setup-kdumpfs.sh 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/init/setup-kdumpfs.sh 2014-05-05 13:37:52.000000000 +0200 @@ -146,7 +146,7 @@ blkdev=$(resolve_device "$desc" "$blkdev") || return 1 blkdev=$(blkdev_by_uuid "$blkdev") - add_fstab "$blkdev" "/kdump${mountpoint}" "$fstype" "$opts" 0 0 + add_fstab "$blkdev" "${mountpoint}" "$fstype" "$opts" 0 0 blockdev="$blockdev $blkdev" echo "$blkdev" @@ -155,6 +155,12 @@ ################################################################################ # +# get the configuration +# + +kdump_get_config || return 1 + +# # check mount points # @@ -166,18 +172,11 @@ touch "${tmp_mnt}/etc/fstab.kdump" -# add the boot partition -if [ -n "${kdump_mnt[0]}" ] -then - bootdev=$(kdump_add_mount "Boot" "${kdump_dev[0]}" "/mnt0" \ - "${kdump_fstype[0]}" "${kdump_opts[0]}" ) -fi - -# additional mount points -i=1 +# add mount points +i=0 while [ $i -lt ${#kdump_mnt[@]} ] do - dev=$(kdump_add_mount "Dump" "${kdump_dev[i]}" "/mnt$i" \ + dev=$(kdump_add_mount "Dump" "${kdump_dev[i]}" "${kdump_mnt[i]}" \ "${kdump_fstype[i]}" "${kdump_opts[i]}" ) [ $? -eq 0 ] || return 1 dumpdev="$dumpdev $dev" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.10/kdumptool/transfer.cc new/kdump-0.8.11/kdumptool/transfer.cc --- old/kdump-0.8.10/kdumptool/transfer.cc 2014-03-27 16:50:27.000000000 +0100 +++ new/kdump-0.8.11/kdumptool/transfer.cc 2014-05-05 13:37:52.000000000 +0200 @@ -626,8 +626,7 @@ } FilePath fp = parser.getPath(); - fp.appendPath(subdir); - fp.mkdir(true); + mkdir(fp.appendPath(subdir), true); } /* -------------------------------------------------------------------------- */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
