shell: aliases: add lsblk alias with --merge

diff --git a/shell/setup.sh b/shell/setup.sh
index 9f622f71494031bd86fb8c2de4a9f8a6a1ce8a76..084193e467a0f6757f0183eed056136c2bb6c768 100755 (executable)
--- a/shell/setup.sh
+++ b/shell/setup.sh
@@ -127,6 +127,11 @@ else
     sed_i '/^alias grep=/ s/^/#/' shell/aliases
 fi
 
     sed_i '/^alias grep=/ s/^/#/' shell/aliases
 fi
 

+if ! lsblk --merge >/dev/null 2>&1; then
+    echo 'shell/aliases: removing lsblk --merge'
+    sed_i 's/lsblk --merge/lsblk/' shell/aliases
+fi
+

 generate screenrc .in cat
 # As screen-256color is not widely supported use it only on machines where the
 # matching terminfo entry is available. This also requires a terminal emulator
 generate screenrc .in cat
 # As screen-256color is not widely supported use it only on machines where the
 # matching terminfo entry is available. This also requires a terminal emulator

diff --git a/shell/shell/aliases.in b/shell/shell/aliases.in
index a17301093c95e4e82a6e3cbd9e80d9f49f24e2a5..a4db8bfee044f0856faa3238e26d00d252eb294e 100644 (file)
--- a/shell/shell/aliases.in
+++ b/shell/shell/aliases.in
@@ -145,4 +145,7 @@ alias ip='ip -brief -color=auto'
 # numbers (-w) and the previous, current and next month (-3)
 alias cal='ncal -b -M -w -3'
 
 # numbers (-w) and the previous, current and next month (-3)
 alias cal='ncal -b -M -w -3'
 

+# Group volumes on mdadm devices instead of displaying them multiple times
+alias lsblk='lsblk --merge'
+

 # vim: ft=sh
 # vim: ft=sh