From 7e2128c8e6732ec0fa9031c8c94d4caeff05c114 Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@digium.com>
Date: Fri, 23 Feb 2018 13:58:54 -0700
Subject: [PATCH] ast_coredumper:  Minor fixes

* Fix --tarball-config so the option doesn't cause an error.

* Allow for missing /etc/os-release.

* Add a sleep between tarballing the coredump and removing the
  output directory to allow the filesystem to settle.

Change-Id: I73e03b13087978bcc7f6bc9f45753990f82d9d77
---
 contrib/scripts/ast_coredumper | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/scripts/ast_coredumper b/contrib/scripts/ast_coredumper
index 884ede71f3..38d95ccaaf 100755
--- a/contrib/scripts/ast_coredumper
+++ b/contrib/scripts/ast_coredumper
@@ -216,6 +216,7 @@ running=false
 RUNNING=false
 latest=false
 tarball_coredumps=false
+tarball_config=false
 delete_coredumps_after=false
 tarball_results=false
 delete_results_after=false
@@ -281,6 +282,9 @@ for a in "$@" ; do
 	--tarball-coredumps)
 		tarball_coredumps=true
 		;;
+	--tarball-config)
+		tarball_config=true
+		;;
 	--delete-coredumps-after)
 		delete_coredumps_after=true
 		;;
@@ -436,7 +440,7 @@ for i in ${!COREDUMPS[@]} ; do
 
 		ln -s ${cf} ${dest}/tmp/${cfname}
 		cp ${outputdir}/${cfname}*.txt ${dest}/tmp/
-		cp /etc/os-release ${dest}/etc/
+		[ -f /etc/os-release ] && cp /etc/os-release ${dest}/etc/
 		if $tarball_config ; then
 			cp -a /etc/asterisk ${dest}/etc/
 		fi
@@ -445,6 +449,7 @@ for i in ${!COREDUMPS[@]} ; do
 		cp -a /usr/sbin/asterisk ${dest}/usr/sbin
 		rm -rf ${tf}
 		tar -chzf ${tf} --transform="s/^[.]/${cfname}/" -C ${dest} .
+		sleep 3
 		rm -rf ${dest}
 		echo "Created $tf"
 	elif $tarball_results ; then
-- 
GitLab