From c8f4dc70e85c297a85f607dd2b2e9178ca0bbf1f Mon Sep 17 00:00:00 2001 From: Zrubi Date: Wed, 11 Dec 2013 12:28:12 +0100 Subject: [PATCH] qubes-hcl-report update --- qvm-tools/qubes-hcl-report | 4 +++- qvm-tools/qvm-check | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/qvm-tools/qubes-hcl-report b/qvm-tools/qubes-hcl-report index ca5a6f32..cc986aba 100755 --- a/qvm-tools/qubes-hcl-report +++ b/qvm-tools/qubes-hcl-report @@ -51,6 +51,7 @@ if [[ $BRAND =~ "O.E.M" ]] PRODUCT=`sudo dmidecode |grep -A9 "Base Board Information" |grep "Product Name:" |cut -d ' ' -f3- |tr -s '[:blank:]' _` fi +KERNEL=`uname -r` CPU=`sudo cat /proc/cpuinfo |grep "model name" |sort -u |cut -d ' ' -f3-` CHIPSET=`sudo lspci -nn |grep "00:00.0.*Host bridge"` VGA=`sudo lspci -nn |grep "VGA\|Display" | sed -e "s/^/\t\t/"` @@ -76,7 +77,8 @@ fi sudo cat /etc/qubes-release |tee ~/$FILENAME.txt echo -echo -e "Model Name:\t$BRAND $PRODUCT\n" |tee -a ~/$FILENAME.txt +echo -e "Model Name:\t$BRAND $PRODUCT" |tee -a ~/$FILENAME.txt +echo -e "Kernel:\t\t$KERNEL\n" |tee ~/$FILENAME.txt echo -e "CPU:\t\t$CPU" |tee -a ~/$FILENAME.txt echo -e "Chipset:\t$CHIPSET" |tee -a ~/$FILENAME.txt echo -e "VGA:$VGA\n" |tee -a ~/$FILENAME.txt diff --git a/qvm-tools/qvm-check b/qvm-tools/qvm-check index de87e546..5792cef6 100755 --- a/qvm-tools/qvm-check +++ b/qvm-tools/qvm-check @@ -44,12 +44,13 @@ def main(): vmname = args[0] vm = qvm_collection.get_vm_by_name(vmname) if vm is None: - if options.verbose: + if options.verbose: print >> sys.stdout, "A VM with the name '{0}' does not exist in the system!".format(vmname) - exit(1) + exit(1) + else: - if options.verbose: + if options.verbose: print >> sys.stdout, "A VM with the name '{0}' is exist.".format(vmname) - exit(0) + exit(0) main()