From a8291ea6db0824b9affb1f2d6182934be9818d47 Mon Sep 17 00:00:00 2001 From: Philippe Vanhaesendonck Date: Tue, 20 Sep 2022 14:06:27 +0200 Subject: [PATCH 1/2] fix(olss): :bug: enable sha-1 for vagrant/ol9. The embedded ssh client in vagrant uses sha-1 for rsa keys. Fixes #71 Signed-off-by: Philippe Vanhaesendonck --- .../cloud/vagrant-virtualbox/files/vagrant-common.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/oracle-linux-image-tools/cloud/vagrant-virtualbox/files/vagrant-common.sh b/oracle-linux-image-tools/cloud/vagrant-virtualbox/files/vagrant-common.sh index 9d4312c..ff680f0 100755 --- a/oracle-linux-image-tools/cloud/vagrant-virtualbox/files/vagrant-common.sh +++ b/oracle-linux-image-tools/cloud/vagrant-virtualbox/files/vagrant-common.sh @@ -44,6 +44,12 @@ vagrant::config() EOF fi + # For OL9 re-enable SHA1 as the vagrant embedded ssh client insists to use + # SHA1 for RSA keys -- See hashicorp/vagrant#12344 + if [[ "${ORACLE_RELEASE}" = "9" ]]; then + /bin/update-crypto-policies --set DEFAULT:SHA1 + fi + cat >>/etc/sysconfig/sshd < Date: Tue, 20 Sep 2022 14:07:59 +0200 Subject: [PATCH 2/2] fix(olss): :bug: vagrant/ol9 does not require mptspi Signed-off-by: Philippe Vanhaesendonck --- .../cloud/vagrant-virtualbox/files/vagrant-common.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/oracle-linux-image-tools/cloud/vagrant-virtualbox/files/vagrant-common.sh b/oracle-linux-image-tools/cloud/vagrant-virtualbox/files/vagrant-common.sh index ff680f0..df8a98a 100755 --- a/oracle-linux-image-tools/cloud/vagrant-virtualbox/files/vagrant-common.sh +++ b/oracle-linux-image-tools/cloud/vagrant-virtualbox/files/vagrant-common.sh @@ -93,9 +93,11 @@ EOF chcon -u system_u -r object_r -t modules_conf_t /etc/modprobe.d/nofloppy.conf # Customize the initramfs - # Enable VMware PVSCSI support for VMware Fusion guests. - echo 'add_drivers+=" mptspi "' > /etc/dracut.conf.d/vmware-fusion-drivers.conf - restorecon /etc/dracut.conf.d/vmware-fusion-drivers.conf + if [[ "${ORACLE_RELEASE}" != "9" ]]; then + # Enable VMware PVSCSI support for VMware Fusion guests. + echo 'add_drivers+=" mptspi "' > /etc/dracut.conf.d/vmware-fusion-drivers.conf + restorecon /etc/dracut.conf.d/vmware-fusion-drivers.conf + fi # There's no floppy controller, but probing for it generates timeouts echo 'omit_drivers+=" floppy "' > /etc/dracut.conf.d/nofloppy.conf restorecon /etc/dracut.conf.d/nofloppy.conf