From 08f36c4b49ef14a2d9d652de682ead1ba5d5bc5a Mon Sep 17 00:00:00 2001 From: Raf Date: Wed, 30 Oct 2019 14:12:42 +0100 Subject: [PATCH 1/2] PSU parsing problem #93 --- sql/psu-2.sql | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sql/psu-2.sql b/sql/psu-2.sql index 787c5e1..828456e 100644 --- a/sql/psu-2.sql +++ b/sql/psu-2.sql @@ -44,11 +44,12 @@ SELECT DBMS_DB_VERSION.VERSION || '.' || DBMS_DB_VERSION.RELEASE into :VERSION F ( select case - WHEN substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1) = '1' THEN TO_DATE('140114','YYMMDD') - WHEN substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1) = '2' THEN TO_DATE('150120','YYMMDD') - WHEN substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1) = '3' THEN TO_DATE('150414','YYMMDD') - WHEN substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1) = '4' THEN TO_DATE('150714','YYMMDD') - WHEN substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1) = '5' THEN TO_DATE('151020','YYMMDD') + WHEN length(substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1)) = 6 THEN TO_DATE(substr(substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1),1,7),'YYMMDD') + WHEN substr(substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1),1,1) = '1' THEN TO_DATE('140114','YYMMDD') + WHEN substr(substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1),1,1) = '2' THEN TO_DATE('150120','YYMMDD') + WHEN substr(substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1),1,1) = '3' THEN TO_DATE('150414','YYMMDD') + WHEN substr(substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1),1,1) = '4' THEN TO_DATE('150714','YYMMDD') + WHEN substr(substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1),1,1) = '5' THEN TO_DATE('151020','YYMMDD') ELSE TO_DATE(substr(substr(DESCRIPTION, - instr(reverse(DESCRIPTION), '.') + 1),1,7),'YYMMDD') END as PSU_DATE From 3902da8b4e8695b2f6c1637f12b9e91b0441d9d9 Mon Sep 17 00:00:00 2001 From: Raf Date: Wed, 30 Oct 2019 15:34:57 +0100 Subject: [PATCH 2/2] Add HyperV support --- fetch/host | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fetch/host b/fetch/host index 061a026..4a97d5a 100755 --- a/fetch/host +++ b/fetch/host @@ -64,6 +64,8 @@ CHECK_TYPE_SERVER_OVM_DMESG=$(dmesg | grep OVM | wc -l) CHECK_TYPE_SERVER_OVM_LOG=$(grep -i ovm /var/log/dmesg | wc -l) CHECK_TYPE_SERVER_VMWARE=$(dmesg | grep VMware | wc -l) CHECK_TYPE_SERVER_VMWARE_LOG=$(grep VMware /var/log/dmesg* | wc -l) +CHECK_TYPE_SERVER_HYPERV=$(dmesg | grep HyperV|wc -l) +CHECK_TYPE_SERVER_HYPERV_LOG=$(grep HyperV /var/log/dmesg* | wc -l) # CHECK_TYPE_SERVER_AIX=$(uname -L | awk '{print $1}') # TODO: HPUX has a specific server type, see original script CHECK_TYPE_SERVER_HPUX=0 @@ -75,6 +77,9 @@ if [ "$CHECK_TYPE_SERVER_OVM_DMESG" -gt 0 ] || [ "$CHECK_TYPE_SERVER_OVM_LOG" -g elif [ $CHECK_TYPE_SERVER_VMWARE -gt 0 ] || [ "$CHECK_TYPE_SERVER_VMWARE_LOG" -gt 0 ]; then TYPE=VMWARE VIRTUAL=Y +elif [ $CHECK_TYPE_SERVER_HYPERV -gt 0 ] || [ "$CHECK_TYPE_SERVER_HYPERV_LOG" -gt 0 ]; then + TYPE=HYPERV + VIRTUAL=Y elif [ $CHECK_TYPE_SERVER_HYPERVISOR -gt 0 ]; then TYPE=VMOTHER VIRTUAL=Y