[PATCH v2 1/3] cleanup: extract functions from kdump.sh to kdump-lib-initramfs.sh

[WANG Chao]

Extract functions from kdump.sh, and construct kdump-lib-initramfs.sh as
kdump common functions/varaibles library.

kdump-lib-initramfs.sh will include kdump-lib.sh, because it will use
the functions from there. IOW, kdump-lib-initramfs.sh will be a superset
of kdump-lib.sh

So after this cleanup:

- scripts running in 1st kernel only have to include kdump-lib.sh
- scripts running in 2nd kernel only have to include kdump-lib-initramfs.sh

Signed-off-by: WANG Chao 
---
 dracut-kdump.sh        | 150 ++----------------------------------------------
 dracut-module-setup.sh |   1 +
 kdump-lib-initramfs.sh | 151 +++++++++++++++++++++++++++++++++++++++++++++++++
 kexec-tools.spec       |   2 +
 4 files changed, 159 insertions(+), 145 deletions(-)
 create mode 100755 kdump-lib-initramfs.sh

diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index e6faf9c..a2bfa05 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -7,30 +7,14 @@ fi

exec &> /dev/console
 . /lib/dracut-lib.sh
-. /lib/kdump-lib.sh
+. /lib/kdump-lib-initramfs.sh

if [ -f "$initdir/lib/dracut/no-emergency-shell" ]; then
     rm -f -- $initdir/lib/dracut/no-emergency-shell
 fi

set -o pipefail
-KDUMP_PATH="/var/crash"
-CORE_COLLECTOR=""
-DEFAULT_CORE_COLLECTOR="makedumpfile -l --message-level 1 -d 31"
-DMESG_COLLECTOR="/sbin/vmcore-dmesg"
-DEFAULT_ACTION="reboot -f"
-DATEDIR=`date +%Y.%m.%d-%T`
-HOST_IP='127.0.0.1'
-DUMP_INSTRUCTION=""
-SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa"
-KDUMP_SCRIPT_DIR="/kdumpscripts"
-DD_BLKSIZE=512
-FINAL_ACTION="reboot -f"
 DUMP_RETVAL=0
-conf_file="/etc/kdump.conf"
-KDUMP_PRE=""
-KDUMP_POST=""
-MOUNTS=""

export PATH=$PATH:$KDUMP_SCRIPT_DIR

@@ -48,27 +32,6 @@ do_dump()
     return $_ret
 }

-do_umount()
-{
-    if [ -n "$MOUNTS" ]; then
-        for mount in $MOUNTS; do
-            ismounted $mount && umount -R $mount
-        done
-    fi
-}
-
-do_final_action()
-{
-    do_umount
-    eval $FINAL_ACTION
-}
-
-do_default_action()
-{
-    wait_for_loginit
-    eval $DEFAULT_ACTION
-}
-
 do_kdump_pre()
 {
     if [ -n "$KDUMP_PRE" ]; then
@@ -88,39 +51,6 @@ add_dump_code()
     DUMP_INSTRUCTION=$1
 }

-# dump_fs <mount point| device>
-dump_fs()
-{
-    local _dev=$(findmnt -k -f -n -r -o SOURCE $1)
-    local _mp=$(findmnt -k -f -n -r -o TARGET $1)
-
-    echo "kdump: dump target is $_dev"
-
-    if [ -z "$_mp" ]; then
-        echo "kdump: error: Dump target $_dev is not mounted."
-        return 1
-    fi
-    MOUNTS="$MOUNTS $_mp"
-
-    # Remove -F in makedumpfile case. We don't want a flat format dump here.
-    [[ $CORE_COLLECTOR = *makedumpfile* ]] && CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e "s/-F//g"`
-
-    echo "kdump: saving to $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/"
-
-    mount -o remount,rw $_mp || return 1
-    mkdir -p $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR || return 1
-
-    save_vmcore_dmesg_fs ${DMESG_COLLECTOR} "$_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/"
-
-    echo "kdump: saving vmcore"
-    $CORE_COLLECTOR /proc/vmcore $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore-incomplete || return 1
-    mv $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore-incomplete $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore
-    sync
-
-    echo "kdump: saving vmcore complete"
-    return 0
-}
-
 dump_raw()
 {
     local _raw=$1
@@ -170,26 +100,6 @@ dump_ssh()
     return 0
 }

-save_vmcore_dmesg_fs() {
-    local _dmesg_collector=$1
-    local _path=$2
-
-    echo "kdump: saving vmcore-dmesg.txt"
-    $_dmesg_collector /proc/vmcore > ${_path}/vmcore-dmesg-incomplete.txt
-    _exitcode=$?
-    if [ $_exitcode -eq 0 ]; then
-        mv ${_path}/vmcore-dmesg-incomplete.txt ${_path}/vmcore-dmesg.txt
-
-	# Make sure file is on disk. There have been instances where later
-	# saving vmcore failed and system rebooted without sync and there
-	# was no vmcore-dmesg.txt available.
-        sync
-        echo "kdump: saving vmcore-dmesg.txt complete"
-    else
-        echo "kdump: saving vmcore-dmesg.txt failed"
-    fi
-}
-
 save_vmcore_dmesg_ssh() {
     local _dmesg_collector=$1
     local _path=$2
@@ -208,7 +118,6 @@ save_vmcore_dmesg_ssh() {
     fi
 }

-
 get_host_ip()
 {
     local _host
@@ -228,61 +137,12 @@ get_host_ip()

read_kdump_conf()
 {
-    if [ ! -f "$conf_file" ]; then
-        echo "kdump: $conf_file not found"
+    if [ ! -f "$KDUMP_CONF" ]; then
+        echo "kdump: $KDUMP_CONF not found"
         return
     fi

-    # first get the necessary variables
-    while read config_opt config_val;
-    do
-        # remove inline comments after the end of a directive.
-        config_val=$(strip_comments $config_val)
-        case "$config_opt" in
-        path)
-        KDUMP_PATH="$config_val"
-            ;;
-        core_collector)
-            [ -n "$config_val" ] && CORE_COLLECTOR="$config_val"
-            ;;
-        sshkey)
-            if [ -f "$config_val" ]; then
-                SSH_KEY_LOCATION=$config_val
-            fi
-            ;;
-        kdump_pre)
-            KDUMP_PRE="$config_val"
-            ;;
-        kdump_post)
-            KDUMP_POST="$config_val"
-            ;;
-        fence_kdump_args)
-            FENCE_KDUMP_ARGS="$config_val"
-            ;;
-        fence_kdump_nodes)
-            FENCE_KDUMP_NODES="$config_val"
-            ;;
-        default)
-            case $config_val in
-                shell)
-                    DEFAULT_ACTION="_emergency_shell kdump"
-                    ;;
-                reboot)
-                    DEFAULT_ACTION="do_umount; reboot -f"
-                    ;;
-                halt)
-                    DEFAULT_ACTION="do_umount; halt -f"
-                    ;;
-                poweroff)
-                    DEFAULT_ACTION="do_umount; poweroff -f"
-                    ;;
-                dump_to_rootfs)
-                    DEFAULT_ACTION="dump_fs $NEWROOT"
-                    ;;
-            esac
-            ;;
-        esac
-    done < $conf_file
+    get_kdump_confs

# rescan for add code for dump target
     while read config_opt config_val;
@@ -300,7 +160,7 @@ read_kdump_conf()
             add_dump_code "dump_ssh $SSH_KEY_LOCATION $config_val"
             ;;
         esac
-    done < $conf_file
+    done < $KDUMP_CONF
 }

fence_kdump_notify()
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 5ab2997..758420b 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -580,6 +580,7 @@ install() {
     inst "/sbin/vmcore-dmesg" "/sbin/vmcore-dmesg"
     inst_hook pre-pivot 9999 "$moddir/kdump.sh"
     inst "/lib/kdump/kdump-lib.sh" "/lib/kdump-lib.sh"
+    inst "/lib/kdump/kdump-lib-initramfs.sh" "/lib/kdump-lib-initramfs.sh"

# Check for all the devices and if any device is iscsi, bring up iscsi
     # target. Ideally all this should be pushed into dracut iscsi module
diff --git a/kdump-lib-initramfs.sh b/kdump-lib-initramfs.sh
new file mode 100755
index 0000000..d16bcf4
--- /dev/null
+++ b/kdump-lib-initramfs.sh
@@ -0,0 +1,151 @@
+# These variables and functions are useful in 2nd kernel
+
+. /lib/dracut-lib.sh
+. /lib/kdump-lib.sh
+
+KDUMP_PATH="/var/crash"
+CORE_COLLECTOR=""
+DEFAULT_CORE_COLLECTOR="makedumpfile -l --message-level 1 -d 31"
+DMESG_COLLECTOR="/sbin/vmcore-dmesg"
+DEFAULT_ACTION="reboot -f"
+DATEDIR=`date +%Y.%m.%d-%T`
+HOST_IP='127.0.0.1'
+DUMP_INSTRUCTION=""
+SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa"
+KDUMP_SCRIPT_DIR="/kdumpscripts"
+DD_BLKSIZE=512
+FINAL_ACTION="reboot -f"
+KDUMP_CONF="/etc/kdump.conf"
+KDUMP_PRE=""
+KDUMP_POST=""
+NEWROOT="/sysroot"
+MOUNTS=""
+
+get_kdump_confs()
+{
+    local config_opt config_val
+
+    while read config_opt config_val;
+    do
+        # remove inline comments after the end of a directive.
+        config_val=$(strip_comments $config_val)
+        case "$config_opt" in
+            path)
+                KDUMP_PATH="$config_val"
+            ;;
+            core_collector)
+                [ -n "$config_val" ] && CORE_COLLECTOR="$config_val"
+            ;;
+            sshkey)
+                if [ -f "$config_val" ]; then
+                    SSH_KEY_LOCATION=$config_val
+                fi
+            ;;
+            kdump_pre)
+                KDUMP_PRE="$config_val"
+            ;;
+            kdump_post)
+                KDUMP_POST="$config_val"
+            ;;
+            fence_kdump_args)
+                FENCE_KDUMP_ARGS="$config_val"
+            ;;
+            fence_kdump_nodes)
+                FENCE_KDUMP_NODES="$config_val"
+            ;;
+            default)
+                case $config_val in
+                    shell)
+                        DEFAULT_ACTION="_emergency_shell kdump"
+                    ;;
+                    reboot)
+                        DEFAULT_ACTION="do_umount; reboot -f"
+                    ;;
+                    halt)
+                        DEFAULT_ACTION="do_umount; halt -f"
+                    ;;
+                    poweroff)
+                        DEFAULT_ACTION="do_umount; poweroff -f"
+                    ;;
+                    dump_to_rootfs)
+                        DEFAULT_ACTION="dump_fs $NEWROOT"
+                    ;;
+                esac
+            ;;
+        esac
+    done < $KDUMP_CONF
+}
+
+# dump_fs <mount point| device>
+dump_fs()
+{
+
+    local _dev=$(findmnt -k -f -n -r -o SOURCE $1)
+    local _mp=$(findmnt -k -f -n -r -o TARGET $1)
+
+    echo "kdump: dump target is $_dev"
+
+    if [ -z "$_mp" ]; then
+        echo "kdump: error: Dump target $_dev is not mounted."
+        return 1
+    fi
+    MOUNTS="$MOUNTS $_mp"
+
+    # Remove -F in makedumpfile case. We don't want a flat format dump here.
+    [[ $CORE_COLLECTOR = *makedumpfile* ]] && CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e "s/-F//g"`
+
+    echo "kdump: saving to $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/"
+
+    mount -o remount,rw $_mp || return 1
+    mkdir -p $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR || return 1
+
+    save_vmcore_dmesg_fs ${DMESG_COLLECTOR} "$_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/"
+
+    echo "kdump: saving vmcore"
+    $CORE_COLLECTOR /proc/vmcore $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore-incomplete || return 1
+    mv $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore-incomplete $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore
+    sync
+
+    echo "kdump: saving vmcore complete"
+}
+
+save_vmcore_dmesg_fs() {
+    local _dmesg_collector=$1
+    local _path=$2
+
+    echo "kdump: saving vmcore-dmesg.txt"
+    $_dmesg_collector /proc/vmcore > ${_path}/vmcore-dmesg-incomplete.txt
+    _exitcode=$?
+    if [ $_exitcode -eq 0 ]; then
+        mv ${_path}/vmcore-dmesg-incomplete.txt ${_path}/vmcore-dmesg.txt
+
+        # Make sure file is on disk. There have been instances where later
+        # saving vmcore failed and system rebooted without sync and there
+        # was no vmcore-dmesg.txt available.
+        sync
+        echo "kdump: saving vmcore-dmesg.txt complete"
+    else
+        echo "kdump: saving vmcore-dmesg.txt failed"
+    fi
+}
+
+do_umount()
+{
+    if [ -n "$MOUNTS" ]; then
+        for mount in $MOUNTS; do
+            ismounted $mount && umount -R $mount
+        done
+    fi
+}
+
+do_default_action()
+{
+    wait_for_loginit
+    eval $DEFAULT_ACTION
+}
+
+do_final_action()
+{
+    do_umount
+    eval $FINAL_ACTION
+}
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 6581277..b55a7f1 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -27,6 +27,7 @@ Source20: kdump-lib.sh
 Source21: kdump-in-cluster-environment.txt
 Source22: kdump-dep-generator.sh
 Source23: kdump-anaconda-addon-001-4-g03898ef.tar.gz
+Source24: kdump-lib-initramfs.sh

#######################################
 # These are sources for mkdumpramfs
@@ -178,6 +179,7 @@ install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8
 install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/kdump/firstboot_kdump.py
 install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/mkdumprd.8
 install -m 755 %{SOURCE20} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib.sh
+install -m 755 %{SOURCE24} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib-initramfs.sh
 %ifnarch s390x
 # For s390x the ELF header is created in the kdump kernel and therefore kexec
 # udev rules are not required

[PATCH v2 2/3] cleanup: mount dump target under /sysroot in 2nd kernel

[WANG Chao]

This patch does the following change in 2nd kernel:
 - dump target is mounted under /sysroot

With this change,  we don't need to track what we've mounted in 2nd
kernel. We can just umount recursively every mount in /sysroot by
command:

umount -R /sysroot

It's very convenient to do so, because it's hard to track what we've
mounted when we're in error handling path (later patches). So mount
everything under /sysroot is reasonable and practical for us.

Also clean up a bit along with this patch.

Signed-off-by: WANG Chao 
---
 kdump-lib-initramfs.sh |  8 +-------
 mkdumprd               | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/kdump-lib-initramfs.sh b/kdump-lib-initramfs.sh
index d16bcf4..9118b64 100755
--- a/kdump-lib-initramfs.sh
+++ b/kdump-lib-initramfs.sh
@@ -19,7 +19,6 @@ KDUMP_CONF="/etc/kdump.conf"
 KDUMP_PRE=""
 KDUMP_POST=""
 NEWROOT="/sysroot"
-MOUNTS=""

get_kdump_confs()
 {
@@ -89,7 +88,6 @@ dump_fs()
         echo "kdump: error: Dump target $_dev is not mounted."
         return 1
     fi
-    MOUNTS="$MOUNTS $_mp"

# Remove -F in makedumpfile case. We don't want a flat format dump here.
     [[ $CORE_COLLECTOR = *makedumpfile* ]] && CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e "s/-F//g"`
@@ -131,11 +129,7 @@ save_vmcore_dmesg_fs() {

do_umount()
 {
-    if [ -n "$MOUNTS" ]; then
-        for mount in $MOUNTS; do
-            ismounted $mount && umount -R $mount
-        done
-    fi
+    umount -Rf $NEWROOT
 }

do_default_action()
diff --git a/mkdumprd b/mkdumprd
index b49b74f..ba35800 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -97,19 +97,19 @@ target_is_root() {

# caller should ensure $1 is valid and mounted in 1st kernel
 to_mount() {
-    local _dev=$1 _s _t _o _mntopts _pdev
-
-    _s=$(findmnt -k -f -n -r -o SOURCE $_dev)
-    _t=$(findmnt -k -f -n -r -o TARGET,FSTYPE $_dev)
-    _o=$(findmnt -k -f -n -r -o OPTIONS $_dev)
-    _o=${_o/#ro/rw} #mount fs target as rw in 2nd kernel
-    # "nofail" mount could be run later than kdump.sh. So we don't pass nofail
-    # for short term.
-    #_o="${_o},nofail" #with nofail set, systemd won't block for mount failure
-    _mntopts="$_t $_o"
+    local _dev=$1 _source _target _fstype _options _mntopts _pdev
+
+    _source=$(findmnt -k -f -n -r -o SOURCE $_dev)
+    _target=$(findmnt -k -f -n -r -o TARGET $_dev)
+    # mount under /sysroot in 2nd kernel, and we umount -R /sysroot before exit
+    _target="/sysroot$_target"
+    _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
+    _options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
+    _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
+    _mntopts="$_target $_fstype $_options"
     #for non-nfs _dev converting to use udev persistent name
-    if [ -b "$_s" ]; then
-        _pdev="$(get_persistent_dev $_s)"
+    if [ -b "$_source" ]; then
+        _pdev="$(get_persistent_dev $_source)"
         if [ $? -ne 0 ]; then
             return 1
         fi

[PATCH v2 2/3] cleanup: mount dump target under /sysroot in 2nd kernel

[Vivek Goyal]

On Tue, Jul 29, 2014 at 08:52:15PM +0800, WANG Chao wrote:
> This patch does the following change in 2nd kernel:
> dump target is mounted under /sysroot
>
> With this change,  we don't need to track what we've mounted in 2nd
> kernel. We can just umount recursively every mount in /sysroot by
> command:
>
> umount -R /sysroot
>
> It's very convenient to do so, because it's hard to track what we've
> mounted when we're in error handling path (later patches). So mount
> everything under /sysroot is reasonable and practical for us.
>
> Also clean up a bit along with this patch.
>
> Signed-off-by: WANG Chao

Acked-by: Vivek Goyal

Vivek
> kdump-lib-initramfs.sh |  8 +-------
>  mkdumprd               | 24 ++++++++++++------------
>  2 files changed, 13 insertions(+), 19 deletions(-)
>
> diff --git a/kdump-lib-initramfs.sh b/kdump-lib-initramfs.sh
> index d16bcf4..9118b64 100755
> --- a/kdump-lib-initramfs.sh
> +++ b/kdump-lib-initramfs.sh
> @@ -19,7 +19,6 @@ KDUMP_CONF="/etc/kdump.conf"
>  KDUMP_PRE=""
>  KDUMP_POST=""
>  NEWROOT="/sysroot"
> -MOUNTS=""
>
> get_kdump_confs()
>  {
> @@ -89,7 +88,6 @@ dump_fs()
>          echo "kdump: error: Dump target $_dev is not mounted."
>          return 1
>      fi
>
> MOUNTS="$MOUNTS $_mp"
>
> # Remove -F in makedumpfile case. We don't want a flat format dump here.
> [[ $CORE_COLLECTOR = *makedumpfile* ]] && CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e "s/-F//g"`
>
> @@ -131,11 +129,7 @@ save_vmcore_dmesg_fs() {
>
> do_umount()
>  {
> if [ -n "$MOUNTS" ]; then
>    for mount in $MOUNTS; do
>        ismounted $mount && umount -R $mount
>    done
> fi
> umount -Rf $NEWROOT
>
> }
>
> do_default_action()
> diff --git a/mkdumprd b/mkdumprd
> index b49b74f..ba35800 100644
> --- a/mkdumprd
> +++ b/mkdumprd
> @@ -97,19 +97,19 @@ target_is_root() {
>
> # caller should ensure $1 is valid and mounted in 1st kernel
>  to_mount() {
> local _dev=$1 _s _t _o _mntopts _pdev
> _s=$(findmnt -k -f -n -r -o SOURCE $_dev)
> _t=$(findmnt -k -f -n -r -o TARGET,FSTYPE $_dev)
> _o=$(findmnt -k -f -n -r -o OPTIONS $_dev)
> _o=${_o/#ro/rw} #mount fs target as rw in 2nd kernel
> # "nofail" mount could be run later than kdump.sh. So we don't pass nofail
> # for short term.
> #_o="${_o},nofail" #with nofail set, systemd won't block for mount failure
> _mntopts="$_t $_o"
> local _dev=$1 _source _target _fstype _options _mntopts _pdev
> _source=$(findmnt -k -f -n -r -o SOURCE $_dev)
> _target=$(findmnt -k -f -n -r -o TARGET $_dev)
> # mount under /sysroot in 2nd kernel, and we umount -R /sysroot before exit
> _target="/sysroot$_target"
> _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
> _options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
> _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
> _mntopts="$_target $_fstype $_options"
> #for non-nfs _dev converting to use udev persistent name
> if [ -b "$_s" ]; then
>    _pdev="$(get_persistent_dev $_s)"
> if [ -b "$_source" ]; then
>    _pdev="$(get_persistent_dev $_source)"
>    if [ $? -ne 0 ]; then
>        return 1
>    fi
>
> -- 
> 1.9.3
>
> kexec mailing list
> [e-mail]
> https://lists.fedoraproject.org/mailman/listinfo/kexec

[PATCH v2 3/3] mkdumprd: append "x-initrd.mount" to the mount options.

[WANG Chao]

Now when mount in /etc/fstab fails, systemd would not consider it as
critical and it would continue to boot. In fact, emergency service is
triggered, but not in a isolation mode, and it results in the emergency
service getting shutdown at some point later of the boot process. We
need isolation otherwise we won't see any emergency service.

That is because in kdump initramfs, mount units specified in /etc/fstab
are required by "local-fs.target". When any of these mounts fails,
local-fs.target fails.

For kdump initramfs, we need to isolate to emergency service on any of
the mount failure, that said, every service should be stopped and onlu
emergency service would run. But local-fs.target won't trigger that on
its failure. That means in case of mount failure, local-fs.target also
enters failure state, but all the service will continue without any
interruption.

After digging looking into source code of systemd-fstab-generator. I
find "x-initrd.mount" using in initramfs mount, will make the mount
units required by "initrd-root-fs.target" rather than it's used to be
"local-fs.target".

"initrd-root-fs.target" is suitable to us because if it fails, it will
isolate to emergency service. That means in case of any mount failure,
the emergeny service will start and everything else will stop. We want
this effect because we need to take kdump fail-safe action when there's
a mount failure.
> From systemd unit point of view, "initrd-root-fs.target" has

OnFailureIsolate=yes, but "local-fs.target" doesn't. From
systemd.unit(5):

OnFailureIsolate=
    Takes a boolean argument. If true, the unit listed in OnFailure=
    will be enqueued in isolation mode, i.e. all units that are not its
    dependency will be stopped. If this is set, only a single unit may
    be listed in OnFailure=. Defaults to false.

NOTE: Harald who contributed "x-initrd.mount" in systemd, confirmed that
      this feature will stay.

Signed-off-by: WANG Chao 
---
 mkdumprd | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mkdumprd b/mkdumprd
index ba35800..5d12a82 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -106,6 +106,17 @@ to_mount() {
     _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
     _options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
     _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
+    # "x-initrd.mount" mount failure will trigger isolate emergency service
+    # W/o this, systemd won't isolate, thus we won't get to emergency.
+    # This is not applicable to remote fs mount, because if we use
+    # "x-initrd.mount", remote mount will become required by
+    # "initrd-root-fs.target", instead of "remote-fs.target". That's how it is
+    # handled within systemd internal. We need remote mount to be required
+    # "remote-fs.target", because we need to bring up network before any remote
+    # mount and "remote-fs.target" can be a checkpoint of that.
+    if ! is_nfs_dump_target; then
+       _options="$_options,x-initrd.mount"
+    fi
     _mntopts="$_target $_fstype $_options"
     #for non-nfs _dev converting to use udev persistent name
     if [ -b "$_source" ]; then

[PATCH v2 3/3] mkdumprd: append "x-initrd.mount" to the mount options.

[Vivek Goyal]

On Tue, Jul 29, 2014 at 08:52:16PM +0800, WANG Chao wrote:
> Now when mount in /etc/fstab fails, systemd would not consider it as
> critical and it would continue to boot. In fact, emergency service is
> triggered, but not in a isolation mode, and it results in the emergency
> service getting shutdown at some point later of the boot process. We
> need isolation otherwise we won't see any emergency service.
>
> That is because in kdump initramfs, mount units specified in /etc/fstab
> are required by "local-fs.target". When any of these mounts fails,
> local-fs.target fails.
>
> For kdump initramfs, we need to isolate to emergency service on any of
> the mount failure, that said, every service should be stopped and onlu
> emergency service would run. But local-fs.target won't trigger that on
> its failure. That means in case of mount failure, local-fs.target also
> enters failure state, but all the service will continue without any
> interruption.
>
> After digging looking into source code of systemd-fstab-generator. I
> find "x-initrd.mount" using in initramfs mount, will make the mount
> units required by "initrd-root-fs.target" rather than it's used to be
> "local-fs.target".
>
> "initrd-root-fs.target" is suitable to us because if it fails, it will
> isolate to emergency service. That means in case of any mount failure,
> the emergeny service will start and everything else will stop. We want
> this effect because we need to take kdump fail-safe action when there's
> a mount failure.
>
> From systemd unit point of view, "initrd-root-fs.target" has
> OnFailureIsolate=yes, but "local-fs.target" doesn't. From
> systemd.unit(5):
>
> OnFailureIsolate=
>     Takes a boolean argument. If true, the unit listed in OnFailure=
>     will be enqueued in isolation mode, i.e. all units that are not its
>     dependency will be stopped. If this is set, only a single unit may
>     be listed in OnFailure=. Defaults to false.
>
> NOTE: Harald who contributed "x-initrd.mount" in systemd, confirmed that
>       this feature will stay.
> Signed-off-by: WANG Chao
>
> mkdumprd | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/mkdumprd b/mkdumprd
> index ba35800..5d12a82 100644
> --- a/mkdumprd
> +++ b/mkdumprd
> @@ -106,6 +106,17 @@ to_mount() {
>      _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
>      _options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
>      _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
> # "x-initrd.mount" mount failure will trigger isolate emergency service
> # W/o this, systemd won't isolate, thus we won't get to emergency.
> # This is not applicable to remote fs mount, because if we use
> # "x-initrd.mount", remote mount will become required by
> # "initrd-root-fs.target", instead of "remote-fs.target". That's how it is
> # handled within systemd internal. We need remote mount to be required
> # "remote-fs.target", because we need to bring up network before any remote
> # mount and "remote-fs.target" can be a checkpoint of that.

Hi Chao,

This explanation looks good. Just add 2 more lines to complete it and
mention that if remote mount fails, dracut-initqueue will still start
and once dracut-initqueue finishes, kdump service will start. Because
remote mount failed, kdump service will fail and it will lead to kdump
error handler.

Thanks
Vivek

[PATCH v2 3/3] mkdumprd: append "x-initrd.mount" to the mount options.

[WANG Chao]

On 07/29/14 at 09:16am, Vivek Goyal wrote:
> On Tue, Jul 29, 2014 at 08:52:16PM +0800, WANG Chao wrote:
> > Now when mount in /etc/fstab fails, systemd would not consider it as
> > critical and it would continue to boot. In fact, emergency service is
> > triggered, but not in a isolation mode, and it results in the emergency
> > service getting shutdown at some point later of the boot process. We
> > need isolation otherwise we won't see any emergency service.
> >
> > That is because in kdump initramfs, mount units specified in /etc/fstab
> > are required by "local-fs.target". When any of these mounts fails,
> > local-fs.target fails.
> >
> > For kdump initramfs, we need to isolate to emergency service on any of
> > the mount failure, that said, every service should be stopped and onlu
> > emergency service would run. But local-fs.target won't trigger that on
> > its failure. That means in case of mount failure, local-fs.target also
> > enters failure state, but all the service will continue without any
> > interruption.
> >
> > After digging looking into source code of systemd-fstab-generator. I
> > find "x-initrd.mount" using in initramfs mount, will make the mount
> > units required by "initrd-root-fs.target" rather than it's used to be
> > "local-fs.target".
> >
> > "initrd-root-fs.target" is suitable to us because if it fails, it will
> > isolate to emergency service. That means in case of any mount failure,
> > the emergeny service will start and everything else will stop. We want
> > this effect because we need to take kdump fail-safe action when there's
> > a mount failure.
> >
> > From systemd unit point of view, "initrd-root-fs.target" has
> > OnFailureIsolate=yes, but "local-fs.target" doesn't. From
> > systemd.unit(5):
> >
> > OnFailureIsolate=
> >     Takes a boolean argument. If true, the unit listed in OnFailure=
> >     will be enqueued in isolation mode, i.e. all units that are not its
> >     dependency will be stopped. If this is set, only a single unit may
> >     be listed in OnFailure=. Defaults to false.
> >
> > NOTE: Harald who contributed "x-initrd.mount" in systemd, confirmed that
> >       this feature will stay.
> > Signed-off-by: WANG Chao
> >
> > mkdumprd | 11 +++++++++++
> >  1 file changed, 11 insertions(+)
> >
> > diff --git a/mkdumprd b/mkdumprd
> > index ba35800..5d12a82 100644
> > --- a/mkdumprd
> > +++ b/mkdumprd
> > @@ -106,6 +106,17 @@ to_mount() {
> >      _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
> >      _options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
> >      _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
> > # "x-initrd.mount" mount failure will trigger isolate emergency service
> > # W/o this, systemd won't isolate, thus we won't get to emergency.
> > # This is not applicable to remote fs mount, because if we use
> > # "x-initrd.mount", remote mount will become required by
> > # "initrd-root-fs.target", instead of "remote-fs.target". That's how it is
> > # handled within systemd internal. We need remote mount to be required
> > # "remote-fs.target", because we need to bring up network before any remote
> > # mount and "remote-fs.target" can be a checkpoint of that.
>
> Hi Chao,
>
> This explanation looks good. Just add 2 more lines to complete it and
> mention that if remote mount fails, dracut-initqueue will still start
> and once dracut-initqueue finishes, kdump service will start. Because
> remote mount failed, kdump service will fail and it will lead to kdump
> error handler.

Will do.

[PATCH v3 3/3] mkdumprd: append "x-initrd.mount" to the mount options.

[WANG Chao]

Now when mount in /etc/fstab fails, systemd would not consider it as
critical and it would continue to boot. In fact, emergency service is
triggered, but not in a isolation mode, and it results in the emergency
service getting shutdown at some point later of the boot process. We
need isolation otherwise we won't see any emergency service.

That is because in kdump initramfs, mount units specified in /etc/fstab
are required by "local-fs.target". When any of these mounts fails,
local-fs.target fails.

For kdump initramfs, we need to isolate to emergency service on any of
the mount failure, that said, every service should be stopped and onlu
emergency service would run. But local-fs.target won't trigger that on
its failure. That means in case of mount failure, local-fs.target also
enters failure state, but all the service will continue without any
interruption.

After digging looking into source code of systemd-fstab-generator. I
find "x-initrd.mount" using in initramfs mount, will make the mount
units required by "initrd-root-fs.target" rather than it's used to be
"local-fs.target".

"initrd-root-fs.target" is suitable to us because if it fails, it will
isolate to emergency service. That means in case of any mount failure,
the emergeny service will start and everything else will stop. We want
this effect because we need to take kdump fail-safe action when there's
a mount failure.
> From systemd unit point of view, "initrd-root-fs.target" has

OnFailureIsolate=yes, but "local-fs.target" doesn't. From
systemd.unit(5):

OnFailureIsolate=
    Takes a boolean argument. If true, the unit listed in OnFailure=
    will be enqueued in isolation mode, i.e. all units that are not its
    dependency will be stopped. If this is set, only a single unit may
    be listed in OnFailure=. Defaults to false.

NOTE: Harald who contributed "x-initrd.mount" in systemd, confirmed that
      this feature will stay.

Signed-off-by: WANG Chao 
---
 mkdumprd | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/mkdumprd b/mkdumprd
index ba35800..409235b 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -106,6 +106,20 @@ to_mount() {
     _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
     _options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
     _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
+    # "x-initrd.mount" mount failure will trigger isolate emergency service
+    # W/o this, systemd won't isolate, thus we won't get to emergency.
+    # This is not applicable to remote fs mount, because if we use
+    # "x-initrd.mount", remote mount will become required by
+    # "initrd-root-fs.target", instead of "remote-fs.target". That's how it is
+    # handled within systemd internal. We need remote mount to be required
+    # "remote-fs.target", because we need to bring up network before any remote
+    # mount and "remote-fs.target" can be a checkpoint of that.
+    # If remote mount fails, dracut-initqueue will still start and once
+    # dracut-initqueue finishes, kdump service will start. Because remote mount
+    # failed, kdump service will fail and it will lead to kdump error handler.
+    if ! is_nfs_dump_target; then
+       _options="$_options,x-initrd.mount"
+    fi
     _mntopts="$_target $_fstype $_options"
     #for non-nfs _dev converting to use udev persistent name
     if [ -b "$_source" ]; then

[PATCH v3 3/3] mkdumprd: append "x-initrd.mount" to the mount options.

[Vivek Goyal]

On Wed, Jul 30, 2014 at 05:33:40PM +0800, WANG Chao wrote:
> Now when mount in /etc/fstab fails, systemd would not consider it as
> critical and it would continue to boot. In fact, emergency service is
> triggered, but not in a isolation mode, and it results in the emergency
> service getting shutdown at some point later of the boot process. We
> need isolation otherwise we won't see any emergency service.
>
> That is because in kdump initramfs, mount units specified in /etc/fstab
> are required by "local-fs.target". When any of these mounts fails,
> local-fs.target fails.
>
> For kdump initramfs, we need to isolate to emergency service on any of
> the mount failure, that said, every service should be stopped and onlu
> emergency service would run. But local-fs.target won't trigger that on
> its failure. That means in case of mount failure, local-fs.target also
> enters failure state, but all the service will continue without any
> interruption.
>
> After digging looking into source code of systemd-fstab-generator. I
> find "x-initrd.mount" using in initramfs mount, will make the mount
> units required by "initrd-root-fs.target" rather than it's used to be
> "local-fs.target".
>
> "initrd-root-fs.target" is suitable to us because if it fails, it will
> isolate to emergency service. That means in case of any mount failure,
> the emergeny service will start and everything else will stop. We want
> this effect because we need to take kdump fail-safe action when there's
> a mount failure.
>
> From systemd unit point of view, "initrd-root-fs.target" has
> OnFailureIsolate=yes, but "local-fs.target" doesn't. From
> systemd.unit(5):
>
> OnFailureIsolate=
>     Takes a boolean argument. If true, the unit listed in OnFailure=
>     will be enqueued in isolation mode, i.e. all units that are not its
>     dependency will be stopped. If this is set, only a single unit may
>     be listed in OnFailure=. Defaults to false.
>
> NOTE: Harald who contributed "x-initrd.mount" in systemd, confirmed that
>       this feature will stay.
>
> Signed-off-by: WANG Chao

Acked-by: Vivek Goyal

Vivek
> mkdumprd | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>
> diff --git a/mkdumprd b/mkdumprd
> index ba35800..409235b 100644
> --- a/mkdumprd
> +++ b/mkdumprd
> @@ -106,6 +106,20 @@ to_mount() {
>      _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
>      _options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
>      _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
> # "x-initrd.mount" mount failure will trigger isolate emergency service
> # W/o this, systemd won't isolate, thus we won't get to emergency.
> # This is not applicable to remote fs mount, because if we use
> # "x-initrd.mount", remote mount will become required by
> # "initrd-root-fs.target", instead of "remote-fs.target". That's how it is
> # handled within systemd internal. We need remote mount to be required
> # "remote-fs.target", because we need to bring up network before any remote
> # mount and "remote-fs.target" can be a checkpoint of that.
> # If remote mount fails, dracut-initqueue will still start and once
> # dracut-initqueue finishes, kdump service will start. Because remote mount
> # failed, kdump service will fail and it will lead to kdump error handler.
> if ! is_nfs_dump_target; then
>   _options="$_options,x-initrd.mount"
> fi
> _mntopts="$_target $_fstype $_options"
> #for non-nfs _dev converting to use udev persistent name
> if [ -b "$_source" ]; then
>
> -- 
> 1.9.3
>
> kexec mailing list
> [e-mail]
> https://lists.fedoraproject.org/mailman/listinfo/kexec

[Vivek Goyal]

On Tue, Jul 29, 2014 at 08:52:14PM +0800, WANG Chao wrote:
> Extract functions from kdump.sh, and construct kdump-lib-initramfs.sh as
> kdump common functions/varaibles library.
>
> kdump-lib-initramfs.sh will include kdump-lib.sh, because it will use
> the functions from there. IOW, kdump-lib-initramfs.sh will be a superset
> of kdump-lib.sh
>
> So after this cleanup:
> scripts running in 1st kernel only have to include kdump-lib.sh
> scripts running in 2nd kernel only have to include kdump-lib-initramfs.sh
>
> Signed-off-by: WANG Chao

Acked-by: Vivek Goyal

Vivek
> dracut-kdump.sh        | 150 ++----------------------------------------------
>  dracut-module-setup.sh |   1 +
>  kdump-lib-initramfs.sh | 151 +++++++++++++++++++++++++++++++++++++++++++++++++
>  kexec-tools.spec       |   2 +
>  4 files changed, 159 insertions(+), 145 deletions(-)
>  create mode 100755 kdump-lib-initramfs.sh
>
> diff --git a/dracut-kdump.sh b/dracut-kdump.sh
> index e6faf9c..a2bfa05 100755
> --- a/dracut-kdump.sh
> +++ b/dracut-kdump.sh
> @@ -7,30 +7,14 @@ fi
>
> exec &> /dev/console
>  . /lib/dracut-lib.sh
> -. /lib/kdump-lib.sh
> +. /lib/kdump-lib-initramfs.sh
>
> if [ -f "$initdir/lib/dracut/no-emergency-shell" ]; then
>      rm -f -- $initdir/lib/dracut/no-emergency-shell
>  fi
>
> set -o pipefail
> -KDUMP_PATH="/var/crash"
> -CORE_COLLECTOR=""
> -DEFAULT_CORE_COLLECTOR="makedumpfile -l --message-level 1 -d 31"
> -DMESG_COLLECTOR="/sbin/vmcore-dmesg"
> -DEFAULT_ACTION="reboot -f"
> -DATEDIR=`date +%Y.%m.%d-%T`
> -HOST_IP='127.0.0.1'
> -DUMP_INSTRUCTION=""
> -SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa"
> -KDUMP_SCRIPT_DIR="/kdumpscripts"
> -DD_BLKSIZE=512
> -FINAL_ACTION="reboot -f"
>  DUMP_RETVAL=0
> -conf_file="/etc/kdump.conf"
> -KDUMP_PRE=""
> -KDUMP_POST=""
> -MOUNTS=""
>
> export PATH=$PATH:$KDUMP_SCRIPT_DIR
>
> @@ -48,27 +32,6 @@ do_dump()
>      return $_ret
>  }
>
> -do_umount()
> -{
> if [ -n "$MOUNTS" ]; then
>    for mount in $MOUNTS; do
>        ismounted $mount && umount -R $mount
>    done
> fi
>
> -}
>
> -do_final_action()
> -{
> do_umount
> eval $FINAL_ACTION
>
> -}
>
> -do_default_action()
> -{
> wait_for_loginit
> eval $DEFAULT_ACTION
>
> -}
>
> do_kdump_pre()
>  {
>      if [ -n "$KDUMP_PRE" ]; then
> @@ -88,39 +51,6 @@ add_dump_code()
>      DUMP_INSTRUCTION=$1
>  }
>
> -# dump_fs <mount point| device>
> -dump_fs()
> -{
> local _dev=$(findmnt -k -f -n -r -o SOURCE $1)
> local _mp=$(findmnt -k -f -n -r -o TARGET $1)
> echo "kdump: dump target is $_dev"
> if [ -z "$_mp" ]; then
>    echo "kdump: error: Dump target $_dev is not mounted."
>    return 1
> fi
> MOUNTS="$MOUNTS $_mp"
> # Remove -F in makedumpfile case. We don't want a flat format dump here.
> [[ $CORE_COLLECTOR = *makedumpfile* ]] && CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e "s/-F//g"`
> echo "kdump: saving to $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/"
> mount -o remount,rw $_mp || return 1
> mkdir -p $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR || return 1
> save_vmcore_dmesg_fs ${DMESG_COLLECTOR} "$_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/"
> echo "kdump: saving vmcore"
> $CORE_COLLECTOR /proc/vmcore $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore-incomplete || return 1
> mv $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore-incomplete $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore
> sync
> echo "kdump: saving vmcore complete"
> return 0
>
> -}
>
> dump_raw()
>  {
>      local _raw=$1
> @@ -170,26 +100,6 @@ dump_ssh()
>      return 0
>  }
>
> -save_vmcore_dmesg_fs() {
> local _dmesg_collector=$1
> local _path=$2
> echo "kdump: saving vmcore-dmesg.txt"
> $_dmesg_collector /proc/vmcore > ${_path}/vmcore-dmesg-incomplete.txt
> _exitcode=$?
> if [ $_exitcode -eq 0 ]; then
>    mv ${_path}/vmcore-dmesg-incomplete.txt ${_path}/vmcore-dmesg.txt
> # Make sure file is on disk. There have been instances where later
> # saving vmcore failed and system rebooted without sync and there
> # was no vmcore-dmesg.txt available.
>    sync
>    echo "kdump: saving vmcore-dmesg.txt complete"
> else
>    echo "kdump: saving vmcore-dmesg.txt failed"
> fi
>
> -}
>
> save_vmcore_dmesg_ssh() {
>      local _dmesg_collector=$1
>      local _path=$2
> @@ -208,7 +118,6 @@ save_vmcore_dmesg_ssh() {
>      fi
>  }
>
> get_host_ip()
>  {
>      local _host
> @@ -228,61 +137,12 @@ get_host_ip()
>
> read_kdump_conf()
>  {
> if [ ! -f "$conf_file" ]; then
>    echo "kdump: $conf_file not found"
> if [ ! -f "$KDUMP_CONF" ]; then
>    echo "kdump: $KDUMP_CONF not found"
>    return
> fi
> # first get the necessary variables
> while read config_opt config_val;
> do
>    # remove inline comments after the end of a directive.
>    config_val=$(strip_comments $config_val)
>    case "$config_opt" in
>    path)
>    KDUMP_PATH="$config_val"
>        ;;
>    core_collector)
>        [ -n "$config_val" ] && CORE_COLLECTOR="$config_val"
>        ;;
>    sshkey)
>        if [ -f "$config_val" ]; then
>            SSH_KEY_LOCATION=$config_val
>        fi
>        ;;
>    kdump_pre)
>        KDUMP_PRE="$config_val"
>        ;;
>    kdump_post)
>        KDUMP_POST="$config_val"
>        ;;
>    fence_kdump_args)
>        FENCE_KDUMP_ARGS="$config_val"
>        ;;
>    fence_kdump_nodes)
>        FENCE_KDUMP_NODES="$config_val"
>        ;;
>    default)
>        case $config_val in
>            shell)
>                DEFAULT_ACTION="_emergency_shell kdump"
>                ;;
>            reboot)
>                DEFAULT_ACTION="do_umount; reboot -f"
>                ;;
>            halt)
>                DEFAULT_ACTION="do_umount; halt -f"
>                ;;
>            poweroff)
>                DEFAULT_ACTION="do_umount; poweroff -f"
>                ;;
>            dump_to_rootfs)
>                DEFAULT_ACTION="dump_fs $NEWROOT"
>                ;;
>        esac
>        ;;
>    esac
> done < $conf_file
>
> get_kdump_confs
>
> # rescan for add code for dump target
> while read config_opt config_val;
>
> @@ -300,7 +160,7 @@ read_kdump_conf()
>              add_dump_code "dump_ssh $SSH_KEY_LOCATION $config_val"
>              ;;
>          esac
> done < $conf_file
> done < $KDUMP_CONF
>
> }
>
> fence_kdump_notify()
> diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
> index 5ab2997..758420b 100755
> --- a/dracut-module-setup.sh
> +++ b/dracut-module-setup.sh
> @@ -580,6 +580,7 @@ install() {
>      inst "/sbin/vmcore-dmesg" "/sbin/vmcore-dmesg"
>      inst_hook pre-pivot 9999 "$moddir/kdump.sh"
>      inst "/lib/kdump/kdump-lib.sh" "/lib/kdump-lib.sh"
>
> inst "/lib/kdump/kdump-lib-initramfs.sh" "/lib/kdump-lib-initramfs.sh"
>
> # Check for all the devices and if any device is iscsi, bring up iscsi
> # target. Ideally all this should be pushed into dracut iscsi module
>
> diff --git a/kdump-lib-initramfs.sh b/kdump-lib-initramfs.sh
> new file mode 100755
> index 0000000..d16bcf4
> --- /dev/null
> +++ b/kdump-lib-initramfs.sh
> @@ -0,0 +1,151 @@
> +# These variables and functions are useful in 2nd kernel
>
> +. /lib/dracut-lib.sh
> +. /lib/kdump-lib.sh
>
> +KDUMP_PATH="/var/crash"
> +CORE_COLLECTOR=""
> +DEFAULT_CORE_COLLECTOR="makedumpfile -l --message-level 1 -d 31"
> +DMESG_COLLECTOR="/sbin/vmcore-dmesg"
> +DEFAULT_ACTION="reboot -f"
> +DATEDIR=`date +%Y.%m.%d-%T`
> +HOST_IP='127.0.0.1'
> +DUMP_INSTRUCTION=""
> +SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa"
> +KDUMP_SCRIPT_DIR="/kdumpscripts"
> +DD_BLKSIZE=512
> +FINAL_ACTION="reboot -f"
> +KDUMP_CONF="/etc/kdump.conf"
> +KDUMP_PRE=""
> +KDUMP_POST=""
> +NEWROOT="/sysroot"
> +MOUNTS=""
>
> +get_kdump_confs()
> +{
> local config_opt config_val
> while read config_opt config_val;
> do
>    # remove inline comments after the end of a directive.
>    config_val=$(strip_comments $config_val)
>    case "$config_opt" in
>        path)
>            KDUMP_PATH="$config_val"
>        ;;
>        core_collector)
>            [ -n "$config_val" ] && CORE_COLLECTOR="$config_val"
>        ;;
>        sshkey)
>            if [ -f "$config_val" ]; then
>                SSH_KEY_LOCATION=$config_val
>            fi
>        ;;
>        kdump_pre)
>            KDUMP_PRE="$config_val"
>        ;;
>        kdump_post)
>            KDUMP_POST="$config_val"
>        ;;
>        fence_kdump_args)
>            FENCE_KDUMP_ARGS="$config_val"
>        ;;
>        fence_kdump_nodes)
>            FENCE_KDUMP_NODES="$config_val"
>        ;;
>        default)
>            case $config_val in
>                shell)
>                    DEFAULT_ACTION="_emergency_shell kdump"
>                ;;
>                reboot)
>                    DEFAULT_ACTION="do_umount; reboot -f"
>                ;;
>                halt)
>                    DEFAULT_ACTION="do_umount; halt -f"
>                ;;
>                poweroff)
>                    DEFAULT_ACTION="do_umount; poweroff -f"
>                ;;
>                dump_to_rootfs)
>                    DEFAULT_ACTION="dump_fs $NEWROOT"
>                ;;
>            esac
>        ;;
>    esac
> done < $KDUMP_CONF
>
> +}
>
> +# dump_fs <mount point| device>
> +dump_fs()
> +{
> local _dev=$(findmnt -k -f -n -r -o SOURCE $1)
> local _mp=$(findmnt -k -f -n -r -o TARGET $1)
> echo "kdump: dump target is $_dev"
> if [ -z "$_mp" ]; then
>    echo "kdump: error: Dump target $_dev is not mounted."
>    return 1
> fi
> MOUNTS="$MOUNTS $_mp"
> # Remove -F in makedumpfile case. We don't want a flat format dump here.
> [[ $CORE_COLLECTOR = *makedumpfile* ]] && CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e "s/-F//g"`
> echo "kdump: saving to $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/"
> mount -o remount,rw $_mp || return 1
> mkdir -p $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR || return 1
> save_vmcore_dmesg_fs ${DMESG_COLLECTOR} "$_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/"
> echo "kdump: saving vmcore"
> $CORE_COLLECTOR /proc/vmcore $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore-incomplete || return 1
> mv $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore-incomplete $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore
> sync
> echo "kdump: saving vmcore complete"
>
> +}
>
> +save_vmcore_dmesg_fs() {
> local _dmesg_collector=$1
> local _path=$2
> echo "kdump: saving vmcore-dmesg.txt"
> $_dmesg_collector /proc/vmcore > ${_path}/vmcore-dmesg-incomplete.txt
> _exitcode=$?
> if [ $_exitcode -eq 0 ]; then
>    mv ${_path}/vmcore-dmesg-incomplete.txt ${_path}/vmcore-dmesg.txt
>    # Make sure file is on disk. There have been instances where later
>    # saving vmcore failed and system rebooted without sync and there
>    # was no vmcore-dmesg.txt available.
>    sync
>    echo "kdump: saving vmcore-dmesg.txt complete"
> else
>    echo "kdump: saving vmcore-dmesg.txt failed"
> fi
>
> +}
>
> +do_umount()
> +{
> if [ -n "$MOUNTS" ]; then
>    for mount in $MOUNTS; do
>        ismounted $mount && umount -R $mount
>    done
> fi
>
> +}
>
> +do_default_action()
> +{
> wait_for_loginit
> eval $DEFAULT_ACTION
>
> +}
>
> +do_final_action()
> +{
> do_umount
> eval $FINAL_ACTION
>
> +}
> diff --git a/kexec-tools.spec b/kexec-tools.spec
> index 6581277..b55a7f1 100644
> --- a/kexec-tools.spec
> +++ b/kexec-tools.spec
> @@ -27,6 +27,7 @@ Source20: kdump-lib.sh
>  Source21: kdump-in-cluster-environment.txt
>  Source22: kdump-dep-generator.sh
>  Source23: kdump-anaconda-addon-001-4-g03898ef.tar.gz
> +Source24: kdump-lib-initramfs.sh
>
> #######################################
>  # These are sources for mkdumpramfs
> @@ -178,6 +179,7 @@ install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8
>  install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/kdump/firstboot_kdump.py
>  install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/mkdumprd.8
>  install -m 755 %{SOURCE20} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib.sh
> +install -m 755 %{SOURCE24} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib-initramfs.sh
>  %ifnarch s390x
>  # For s390x the ELF header is created in the kdump kernel and therefore kexec
> # udev rules are not required
>
> 1.9.3
>
> kexec mailing list
> [e-mail]
> https://lists.fedoraproject.org/mailman/listinfo/kexec