Skip to content

Commit 4a60fa5

Browse files
authored
Merge pull request #73 from AmedeeBulle/olss-ol9-sha1
OL9 / Vagrant fixes
2 parents d1f6011 + 817103d commit 4a60fa5

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

oracle-linux-image-tools/cloud/vagrant-virtualbox/files/vagrant-common.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ vagrant::config()
4444
EOF
4545
fi
4646

47+
# For OL9 re-enable SHA1 as the vagrant embedded ssh client insists to use
48+
# SHA1 for RSA keys -- See hashicorp/vagrant#12344
49+
if [[ "${ORACLE_RELEASE}" = "9" ]]; then
50+
/bin/update-crypto-policies --set DEFAULT:SHA1
51+
fi
52+
4753
cat >>/etc/sysconfig/sshd <<EOF
4854
4955
# Decrease connection time by preventing reverse DNS lookups
@@ -87,9 +93,11 @@ EOF
8793
chcon -u system_u -r object_r -t modules_conf_t /etc/modprobe.d/nofloppy.conf
8894

8995
# Customize the initramfs
90-
# Enable VMware PVSCSI support for VMware Fusion guests.
91-
echo 'add_drivers+=" mptspi "' > /etc/dracut.conf.d/vmware-fusion-drivers.conf
92-
restorecon /etc/dracut.conf.d/vmware-fusion-drivers.conf
96+
if [[ "${ORACLE_RELEASE}" != "9" ]]; then
97+
# Enable VMware PVSCSI support for VMware Fusion guests.
98+
echo 'add_drivers+=" mptspi "' > /etc/dracut.conf.d/vmware-fusion-drivers.conf
99+
restorecon /etc/dracut.conf.d/vmware-fusion-drivers.conf
100+
fi
93101
# There's no floppy controller, but probing for it generates timeouts
94102
echo 'omit_drivers+=" floppy "' > /etc/dracut.conf.d/nofloppy.conf
95103
restorecon /etc/dracut.conf.d/nofloppy.conf

0 commit comments

Comments
 (0)