From ce972ddf4d9a15a3ee79eb8a4247f170d4ebe97e Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Mon, 3 Apr 2023 17:23:05 -0400 Subject: [PATCH 1/2] Upgrade to python3.9 --- imgfac/ApplicationConfiguration.py | 2 +- scripts/imagefactory_dev_setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/imgfac/ApplicationConfiguration.py b/imgfac/ApplicationConfiguration.py index 5a8fdae6..8da7ec97 100644 --- a/imgfac/ApplicationConfiguration.py +++ b/imgfac/ApplicationConfiguration.py @@ -160,7 +160,7 @@ def dencode(a_dict, encoding='ascii'): return new_dict config_file = open(configuration.config) - uconfig = json.load(config_file, encoding="utf-8") + uconfig = json.load(config_file) config_file.close() defaults = uconfig print(defaults) diff --git a/scripts/imagefactory_dev_setup.sh b/scripts/imagefactory_dev_setup.sh index 77a0e5d0..d70f0f4f 100755 --- a/scripts/imagefactory_dev_setup.sh +++ b/scripts/imagefactory_dev_setup.sh @@ -1,7 +1,7 @@ # N.B. Tested on Fedora 17 only. Path's may change depending on your distro. # Be sure to check these values are correct for your system. -PYTHON_PATH="/usr/lib/python2.7" +PYTHON_PATH="/usr/lib/python3.9" IMAGEFACTORY_PLUGINS=/etc/imagefactory/plugins.d/ WORKING_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" From 45a8db3b44175176ecb960d55178f987b16bbf5e Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Tue, 15 Apr 2025 17:01:40 -0400 Subject: [PATCH 2/2] Add profiles for RHEL/CentOS 8 & 9 --- imagefactory_plugins/TinMan/TinMan.info | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/imagefactory_plugins/TinMan/TinMan.info b/imagefactory_plugins/TinMan/TinMan.info index bd61a02d..9e512283 100644 --- a/imagefactory_plugins/TinMan/TinMan.info +++ b/imagefactory_plugins/TinMan/TinMan.info @@ -3,7 +3,9 @@ "targets": [ ["Fedora", null, null], ["RHEL-6", null, null], ["RHEL-5", null, null], ["Ubuntu", null, null], ["CentOS-6", null, null], ["CentOS-5", null, null], ["ScientificLinux-6", null, null], ["ScientificLinux-5", null, null], ["OpenSUSE", null, null], - [ "RHEL-7", null, null ], [ "CentOS-7", null, null ], [ "ScientificLinux-7", null, null ] ], + [ "RHEL-7", null, null ], [ "CentOS-7", null, null ], [ "ScientificLinux-7", null, null ], + [ "RHEL-8", null, null ], [ "CentOS-8", null, null ], + [ "RHEL-9", null, null ], [ "CentOS-9", null, null ]], "description": "Plugin to support most Oz customize capable guest types", "maintainer": { "name": "Red Hat, Inc.",