xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 11:22:27 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6952 from peterwywong/xcatsnap

Browse Source 
Update xcatsnap by collecting more files and improving its code
This commit is contained in:
besawn
2021-04-23 17:52:20 -04:00
committed by GitHub
parent e21654df18 5430fde3a3
commit 5b67d116f2
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xCAT-server/sbin/xcatsnap
View File

@@ -103,7 +103,7 @@ sub run_cmd {
eval {
local $SIG{ALRM} = sub { die "Timeout\n" };
alarm 600;
@output = `$Command`;
@output = `/bin/bash -c \'$Command\'`;
alarm 0;
};
if ($@) {
@@ -209,7 +209,12 @@ sub snap_it {
"/etc/rsyslog.conf", "/etc/rsyslog.d/*",
"/var/lib/dhcpd/dhcpd.leases", "/etc/hosts", "/etc/resolv.conf",
"/etc/named.conf", "/etc/conserver.cf", "/var/log/conserver",
"/etc/nsswitch.conf", "/var/log/messages", "/var/log/xcat/*");
"/etc/nsswitch.conf", "/var/log/messages", "/var/log/xcat/*",
"/etc/dhcp/dhcpd.conf", "/etc/dhcp/dhcpd6.conf",
"/etc/dhcpd6.conf", "/var/lib/dhcp/db/dhcpd.leases",
"/var/lib/dhcp/dhcpd.leases","/etc/goconserver/server.conf",
"/var/log/goconserver/*", "/etc/logrotate.d/goconserver",
"/etc/bind/named.conf");
print("@files_array \n");
}
foreach my $item (@files_array) {
@@ -220,15 +225,12 @@ sub snap_it {
print "Gathering system configuration...\n\n";
$output_dir = "$logDirectory/commands_output/";
my $xcatroot = $ENV{'XCATROOT'};
my $installdir;
chop($installdir =
`tabdump site | grep installdir | cut -f2 -d ,`);
make_output_dir();
if ($OSname eq "AIX") {
@Commands_array = (
"uname -a", "ifconfig -a", "netstat -in", "netstat -rn", "env",
"reventlog -a", "lsmod", "/sbin/lspci", "lssrc -a", "rpm -qa",
"ls $installdir", "/bin/crontab -l",
"ls $INSTALLDIR", "/bin/crontab -l",
"find /tftpboot -size -32k", "ls -lR $xcatroot",
"arp -a", "ps -edlf", "ps -aux", "ulimit -a", "df -k", "oslevel",
"netstat -A", "errpt -a", "/usr/sbin/instfix -i",
@@ -237,8 +239,8 @@ sub snap_it {
elsif ($OSname eq "Linux") {
@Commands_array = (
"uname -a", "ifconfig -a", "netstat -in", "netstat -rn", "env",
"reventlog -a", "lsmod", "/sbin/lspci", "lssrc -a", "rpm -qa",
"ls $installdir", "/usr/bin/crontab -l",
"reventlog -a", "lsmod", "lspci", "lssrc -a", "rpm -qa",
"ls $INSTALLDIR", "/usr/bin/crontab -l", "apt list",
"find /tftpboot -size -32k", "ls -lR $xcatroot",
"arp -a", "ps -edlf", "ps -aux", "ulimit -a", "df -k",
"cat /etc/issue", "lsxcatd -a", "cat /proc/meminfo", "cat /proc/cpuinfo", "journalctl -b --no-pager -u xcatd");