Fixes kdump initrd assembly + cosmetic fixes on kdumpctl (#5123)

* Required grep binary missing from initrd

The grep binary is not included in the dracut_install, however the
grep command is used in several scripts used for kdump. When enabling
kdump, Mariner no longer boots due to missing grep binary

* fix kdumpctl displays hostname help page

kdumpctl uses switches in hostname that don't exist. Replacing them

SPECS/kexec-tools/dracut-module-setup.sh

@@ -798,6 +798,7 @@ install() {
     inst "$moddir/monitor_dd_progress" "/kdumpscripts/monitor_dd_progress"
     chmod +x ${initdir}/kdumpscripts/monitor_dd_progress
     inst "/bin/dd" "/bin/dd"
+    inst "/bin/grep" "/bin/grep"
     inst "/bin/tail" "/bin/tail"
     inst "/bin/date" "/bin/date"
     inst "/bin/sync" "/bin/sync"

SPECS/kexec-tools/kdumpctl

@@ -957,7 +957,7 @@ selinux_relabel()
 check_fence_kdump_config()
 {
 	local hostname=`hostname`
-	local ipaddrs=`hostname -I`
+	local ipaddrs=`hostname -i`
 	local nodes=$(get_option_value "fence_kdump_nodes")
 
 	for node in $nodes; do

SPECS/kexec-tools/kexec-tools.signatures.json

@@ -9,7 +9,7 @@
   "dracut-kdump-error-handler.service": "d5cd3a6cce04955a07ae5cd7790ae17365b90a4989f1888d7b7f487316a1544d",
   "dracut-kdump-error-handler.sh": "23bb509940a9ecc3944bb88526b974f49cfb7d6c133fe11615d8d4604141e4c9",
   "dracut-kdump.sh": "0aef51b237b0d1fb7eed6a5eea2fd1d81d251d6ecb084a57b5070224cab0315c",
-  "dracut-module-setup.sh": "437b0b82c27d7a96d3baf847aaf33f7ca824676193d783619e938417c9d866ec",
+  "dracut-module-setup.sh": "b7f8a4a573e5a424591825f25ea91ab8a995cd8f8d0c28e2b549a3dae83cb627",
   "dracut-monitor_dd_progress": "2e343a54c032f6af0d5f7b5fb49f2d90057b2a234625fe7ee6c1afb21cb5c435",
   "early-kdump-howto.txt": "984d51f3d9e7f2f858ef153418190c470bf20ee702c97fe34285c6d05078999c",
   "eppic-e8844d3.tar.gz": "5bf3fce09fc880a96cbc0cbb3eadcae1892d7fd43350a585f150b1cce176b128",
@@ -26,7 +26,7 @@
   "kdump.sysconfig.aarch64": "a829f3a0f88d983ccec2782b048f12a2eafca71aac4dd42acac2eaea8f7dd8d9",
   "kdump.sysconfig.i386": "1175bcc11be49841d4b8c3f9612e68bb7b2e0e8f00067ffa782fd9dba04f821d",
   "kdump.sysconfig.x86_64": "850b3be780165d0721edb8d34b2ba28aafc60b29850ff627daf04190369e359c",
-  "kdumpctl": "988d0e666a3ecd3d5e8d6d98fc07d2922764b39782bf4b0f1235ef72bfa7eca9",
+  "kdumpctl": "d511b5db0ea2de014fb06ec9fa0a6a4fdf508a3ba6c0d73344870f245ebd4c23",
   "kdumpctl.8": "025a39d212eed0584da7c23c1bb50d6ab797a0fa3c686ac6b80391af875dbaec",
   "kexec-kdump-howto.txt": "e783390a9aa582a2b5e7981cd3277081385340b5873a3f0633c789811876eccb",
   "kexec-tools-2.0.23.tar.xz": "aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b",
@@ -35,4 +35,4 @@
   "mkdumprd": "ebe0cbd1152d9db3333357e898685854c7667d4c6d9df4c79196ab1e7294dad2",
   "mkdumprd.8": "c2e85b4f28cfda870a8d7b4dec656a0bc88895e4b138e9bc4cf756ff7f839bcf"
  }
-}
+}

SPECS/kexec-tools/kexec-tools.spec

@@ -6,7 +6,7 @@
 Summary:        The kexec/kdump userspace component
 Name:           kexec-tools
 Version:        2.0.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -324,6 +324,9 @@ done
 /usr/share/makedumpfile/
 
 %changelog
+* Fri Mar 17 2023 Andy Zaugg <azaugg@linkedin.com> - 2.0.23-2
+- Required binary grep missing from squashfs
+- kdumpctl support for the version of hostname being shipped with Mariner
 * Fri Mar 04 2022 Andrew Phelps <anphel@microsoft.com> - 2.0.23-1
 - Update version to 2.0.23
 - License verified