diff --git a/WHATS_NEW b/WHATS_NEW index 2e7e13856..0afd52722 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.156 - ================================ + If available, also collect output from lsblk command when running lvmdump -s. Fix regression in blkdeactivate causing dm and md devices to be skipped. (2.02.155) Version 2.02.155 - 3rd June 2016 diff --git a/man/lvmdump.8.in b/man/lvmdump.8.in index f9c22846f..d0e102e96 100644 --- a/man/lvmdump.8.in +++ b/man/lvmdump.8.in @@ -85,10 +85,11 @@ history for all yet uncollected results of polling operations already finished including reason. .TP .B \-s -Gather system info and context. Currently, this encompasses systemd info -and context only: overall state of systemd units present in the system, -more detailed status of units controlling LVM functionality and the content -of systemd journal for current boot. +Gather system info and context. Currently, this encompasses info gathered +by calling lsblk command and various systemd info and context: overall state +of systemd units present in the system, more detailed status of units +controlling LVM functionality and the content of systemd journal for +current boot. .TP .B \-u Gather udev info and context: /etc/udev/udev.conf file, udev daemon version diff --git a/scripts/lvmdump.sh b/scripts/lvmdump.sh index a81353746..bfe79d994 100755 --- a/scripts/lvmdump.sh +++ b/scripts/lvmdump.sh @@ -252,13 +252,22 @@ if (( $sysreport )); then SYSTEMCTL=$(which systemctl 2>> $log) JOURNALCTL=$(which journalctl 2>> $log) + LSBLK=$(which lsblk 2>> $log) + + log "$MKDIR -p \"$sysreport_dir\"" + + if test -z "LSBLK"; then + myecho "WARNING: lsblk not found" + else + log "$LSBLK -O >> \"$sysreport_dir/lsblk\"" + log "$LSBLK -s >> \"$sysreport_dir/lsblk_s\"" + fi if test -z "$SYSTEMCTL"; then myecho "WARNING: systemctl not found" elif test -z "$JOURNALCTL"; then myecho "WARNING: journalctl not found" else - log "$MKDIR -p \"$sysreport_dir\"" log "$JOURNALCTL -b --no-pager -o short-precise > \"$sysreport_dir/journal_content\" 2>> \"$log\"" log "$SYSTEMCTL status -l --no-pager -n $log_lines -o short-precise dm-event.socket dm-event.service \ lvm2-monitor.service \