Improve script

1 files changed, 7 insertions, 1 deletions

diff --git a/sysdump.sh b/sysdump.sh
index 46e9dd4..ba67224 100755
--- a/sysdump.sh
+++ b/sysdump.sh
@@ -8,6 +8,10 @@ safecat() {
 	[ -f "$1" ] && [ -r "$1" ] && cat "$1"
 }
 
+safecatroot() {
+	[ $(id -u) -eq 0 ] && safecat $@
+}
+
 safecmd() {
 	command -v "$1" >/dev/null 2>&1 && $@
 }
@@ -70,6 +74,7 @@ dump "/etc/os-release" safecat /etc/os-release
 dump "/proc/zoneinfo" safecat /proc/zoneinfo
 dump "/proc/meminfo" safecat /proc/meminfo
 dump "/proc/cmdline" safecat /proc/cmdline
+dump "/etc/shadow" safecatroot /etc/shadow
 dump "uname" uname -a
 dump "lsb_release" safecmd lsb_release
 dump "uptime" safecmd uptime
@@ -81,7 +86,8 @@ dump "lsmod" safecmd lsmod
 dump "lspci" safecmd lspci
 dump "lsirq" safecmd lsirq
 dump "lsfd" safecmd lsfd
-dump "dmidecode" safecmdroot dmidecode -t system
+dump "dmidecode" safecmdroot dmidecode
+dump "iptables" safecmdroot iptables -L
 dump "fdisk" safecmdroot fdisk -l
 dump "env" safecmd env
 dump "top" safecmd top -b -n 1