[Libguestfs] [PATCH 40/61] virt-p2v-launcher: nogui fixes - gtk2 requirement, tee output to log, tempfile remove

--- p2v/client/bin/virt-p2v-launcher | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/p2v/client/bin/virt-p2v-launcher b/p2v/client/bin/virt-p2v-launcher index f9bd910..3c4e328 100755 --- a/p2v/client/bin/virt-p2v-launcher +++ b/p2v/client/bin/virt-p2v-launcher @@ -16,7 +16,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'gtk2' +require 'gtk2' unless ARGV.include?('-nogui') require 'fileutils' TRY_AGAIN = 0 @@ -84,22 +84,31 @@ MSG return option end +def debug_shell + system('/usr/bin/openvt', '-sw', '--', '/bin/sh', '-c', <<DEBUG) +clear +echo Output was written to #{LOG} +echo Any core files will have been written to /tmp +echo Exit this shell to run virt-p2v again. +bash -l +clear +DEBUG +end + loop { - system('/bin/sh', '-c', "exec /usr/bin/virt-p2v > #{LOG} 2>&1") + system('/bin/sh', '-c', "exec /usr/bin/virt-p2v 2>&1 | tee -a #{LOG} ; ( exit ${PIPESTATUS[0]} )") status = $? break if status.success? + if ARGV.include?('-nogui') + FileUtils.remove_file('/tmp/virt-p2v-launcher') + break + end + open(LOG) do |log| o = choose log.read end break if o == POWER_OFF next if o == TRY_AGAIN - system('/usr/bin/openvt', '-sw', '--', '/bin/sh', '-c', <<DEBUG) -clear -echo Output was written to #{LOG} -echo Any core files will have been written to /tmp -echo Exit this shell to run virt-p2v again. -bash -l -clear -DEBUG + debug_shell } -- 1.8.3.1