From 7a9e434f3b1ce0666393e18d36c10cf2dd454ef2 Mon Sep 17 00:00:00 2001 From: "Thiago H. S. Picharski" <thsp08@c3sl.ufpr.br> Date: Thu, 10 Jun 2010 10:37:09 -0300 Subject: [PATCH] disk.tree: Fixed bug that captures cdrom drive on disk collect data All drives linked in /dev/cdrom* will be ignored. Signed-off-by: Thiago H. S. Picharski <thsp08@c3sl.ufpr.br> Acked-by: Diego Pasqualin <dgp06@c3sl.ufpr.br> Acked-by: Vinicius Ruoso <vkr07@c3sl.ufpr.br> Signed-off-by: Josiney de Souza <josineys@c3sl.ufpr.br> --- scripts/collect/inventory/disk.tree | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/collect/inventory/disk.tree b/scripts/collect/inventory/disk.tree index 45a08e4..04574ad 100755 --- a/scripts/collect/inventory/disk.tree +++ b/scripts/collect/inventory/disk.tree @@ -30,7 +30,8 @@ raid=false if test -d "/dev/disk/by-id/"; then for line in $(ls -l --time-style="+%F %R" /dev/disk/by-id/ | grep "usb" | - awk '{print $10}' | grep "[a-z]$"); do + awk '{print $10}' | grep "[a-z]$"; ls -l --time-style="+%F %R"\ + /dev/cdrom* | awk '{print $10}' | grep "[a-z]$"); do test -n "${massStorage}" && massStorage="${massStorage}|" massStorage="${massStorage}$(basename $line)" done -- GitLab