Merge pull request #539 from oracle/rcitton

scoter-oracle · web-flow · commit 36c7b33c5f9f · 2025-03-07T14:49:10.000+01:00
Rcitton
diff --git a/OracleDG/OL8/scripts/06_do_RDBMS_software_installation.sh b/OracleDG/OL8/scripts/06_do_RDBMS_software_installation.sh
@@ -3,7 +3,7 @@
 #
 # LICENSE UPL 1.0
 #
-# Copyright (c) 1982-2024 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1982-2025 Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      06_do_RDBMS_software_installation
@@ -18,8 +18,9 @@
 #       ruggero.citton@oracle.com
 #
 #    MODIFIED   (MM/DD/YY)
-#    rcitton     03/30/20 - VBox libvirt & kvm support
-#    rcitton     11/06/18 - Creation
+#    doverbyh    03/07/2025 - 19c support
+#    rcitton     03/30/2020 - VBox libvirt & kvm support
+#    rcitton     11/06/2018 - Creation
 # 
 #    REVISION
 #    20240603 - $Revision: 2.0.2.1 $
@@ -36,6 +37,9 @@ unzip -oq /vagrant/ORCL_software/${DB_SOFTWARE}
 echo "-----------------------------------------------------------------"
 echo -e "${INFO}`date +%F' '%T`: Installing RDBMS software"
 echo "-----------------------------------------------------------------"
+if [ "${DB_MAJOR}" == "19" ]; then
+  export CV_ASSUME_DISTID=OEL7.8
+fi
 
 ${DB_HOME}/runInstaller -ignorePrereq -waitforcompletion -silent \
         -responseFile ${DB_HOME}/install/response/db_install.rsp \
diff --git a/OracleDG/OL9/scripts/06_do_RDBMS_software_installation.sh b/OracleDG/OL9/scripts/06_do_RDBMS_software_installation.sh
@@ -3,7 +3,7 @@
 #
 # LICENSE UPL 1.0
 #
-# Copyright (c) 1982-2024 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1982-2025 Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      06_do_RDBMS_software_installation
@@ -18,8 +18,9 @@
 #       ruggero.citton@oracle.com
 #
 #    MODIFIED   (MM/DD/YY)
-#    rcitton     03/30/20 - VBox libvirt & kvm support
-#    rcitton     11/06/18 - Creation
+#    doverbyh    03/07/2025 - 19c support
+#    rcitton     03/30/2020 - VBox libvirt & kvm support
+#    rcitton     11/06/2018 - Creation
 # 
 #    REVISION
 #    20240603 - $Revision: 2.0.2.1 $
@@ -36,6 +37,9 @@ unzip -oq /vagrant/ORCL_software/${DB_SOFTWARE}
 echo "-----------------------------------------------------------------"
 echo -e "${INFO}`date +%F' '%T`: Installing RDBMS software"
 echo "-----------------------------------------------------------------"
+if [ "${DB_MAJOR}" == "19" ]; then
+  export CV_ASSUME_DISTID=OEL7.8
+fi
 
 ${DB_HOME}/runInstaller -ignorePrereq -waitforcompletion -silent \
         -responseFile ${DB_HOME}/install/response/db_install.rsp \

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# LICENSE UPL 1.0`
`5`	`5`	`#`
`6`		`-# Copyright (c) 1982-2024 Oracle and/or its affiliates. All rights reserved.`
	`6`	`+# Copyright (c) 1982-2025 Oracle and/or its affiliates. All rights reserved.`
`7`	`7`	`#`
`8`	`8`	`# NAME`
`9`	`9`	`# 06_do_RDBMS_software_installation`
`@@ -18,8 +18,9 @@`
`18`	`18`	`# [email protected]`
`19`	`19`	`#`
`20`	`20`	`# MODIFIED (MM/DD/YY)`
`21`		`-# rcitton 03/30/20 - VBox libvirt & kvm support`
`22`		`-# rcitton 11/06/18 - Creation`
	`21`	`+# doverbyh 03/07/2025 - 19c support`
	`22`	`+# rcitton 03/30/2020 - VBox libvirt & kvm support`
	`23`	`+# rcitton 11/06/2018 - Creation`
`23`	`24`	`#`
`24`	`25`	`# REVISION`
`25`	`26`	`# 20240603 - $Revision: 2.0.2.1 $`
`@@ -36,6 +37,9 @@ unzip -oq /vagrant/ORCL_software/${DB_SOFTWARE}`
`36`	`37`	`echo "-----------------------------------------------------------------"`
`37`	`38`	echo -e "${INFO}`date +%F' '%T`: Installing RDBMS software"
`38`	`39`	`echo "-----------------------------------------------------------------"`
	`40`	`+if [ "${DB_MAJOR}" == "19" ]; then`
	`41`	`+ export CV_ASSUME_DISTID=OEL7.8`
	`42`	`+fi`
`39`	`43`
`40`	`44`	`${DB_HOME}/runInstaller -ignorePrereq -waitforcompletion -silent \`
`41`	`45`	`-responseFile ${DB_HOME}/install/response/db_install.rsp \`